Add experimental k8s version to rke cluster options

rancher/rancher#15919
This commit is contained in:
Westly Wright 2018-10-02 16:07:50 -07:00
parent 2253272229
commit c46b92de6e
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 86 additions and 68 deletions

View File

@ -109,8 +109,10 @@ export default InputTextFile.extend(ClusterDriver, {
isEdit: equal('mode', 'edit'), isEdit: equal('mode', 'edit'),
notView: or('isNew', 'isEdit'), notView: or('isNew', 'isEdit'),
clusterState: alias('model.originalCluster.state'), clusterState: alias('model.originalCluster.state'),
// Custom stuff // Custom stuff
isCustom: equal('nodeWhich', 'custom'), isCustom: equal('nodeWhich', 'custom'),
init() { init() {
this._super(); this._super();
@ -367,6 +369,7 @@ export default InputTextFile.extend(ClusterDriver, {
versionChoices: computed('initialVersion', `settings.${ C.SETTING.VERSIONS_K8S }`, 'config.kubernetesVersion', function() { versionChoices: computed('initialVersion', `settings.${ C.SETTING.VERSIONS_K8S }`, 'config.kubernetesVersion', function() {
const versions = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}'); const versions = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}');
const { experimentalVersion } = this;
if ( !versions ) { if ( !versions ) {
return []; return [];
@ -393,7 +396,16 @@ export default InputTextFile.extend(ClusterDriver, {
} }
return sortVersions(out).reverse().map((v) => { return sortVersions(out).reverse().map((v) => {
return { value: v } let label = v;
if (v === experimentalVersion) {
label = `${ v } (experimental)`
}
return {
label,
value: v
};
}); });
}), }),
@ -571,6 +583,9 @@ export default InputTextFile.extend(ClusterDriver, {
return value; return value;
} }
}), }),
experimentalVersion: C.EXPERIMENTAL_VERSIONS.RKE_K8S,
willSave() { willSave() {
if ( get(this, 'registry') === 'custom' ) { if ( get(this, 'registry') === 'custom' ) {
const registry = { const registry = {

View File

@ -59,7 +59,6 @@
<label class="acc-label">{{t 'clusterNew.rke.version.label'}}</label> <label class="acc-label">{{t 'clusterNew.rke.version.label'}}</label>
{{new-select {{new-select
content=versionChoices content=versionChoices
optionLabelPath='value'
value=cluster.rancherKubernetesEngineConfig.kubernetesVersion value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
}} }}
</div> </div>

View File

@ -693,4 +693,8 @@ C.NOTIFIER_TABLE_LABEL = {
DEFAULT: 'Notifier', DEFAULT: 'Notifier',
} }
C.EXPERIMENTAL_VERSIONS = {
RKE_K8S: 'v1.12.0-rancher1-1'
}
export default C; export default C;