diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index b5d345ad8..9535a9b2a 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -69,28 +69,28 @@ const INGRESSCHOICES = [
];
export default InputTextFile.extend(ClusterDriver, {
- globalStore: service(),
- settings: service(),
- growl: service(),
- intl: service(),
+ globalStore: service(),
+ settings: service(),
+ growl: service(),
+ intl: service(),
layout,
- networkContent: NETWORKCHOICES,
- authChoices: AUTHCHOICES,
- ingressChoices: INGRESSCHOICES,
+ networkContent: NETWORKCHOICES,
+ authChoices: AUTHCHOICES,
+ ingressChoices: INGRESSCHOICES,
- configField: 'rancherKubernetesEngineConfig',
- registry: 'default',
- accept: '.yml, .yaml',
- loading: false,
- pasteOrUpload: false,
- model: null,
- initialVersion: null,
- registryUrl: null,
- registryUser: null,
- registryPass: null,
- clusterOptErrors: null,
- nodeNameErrors: null,
+ configField: 'rancherKubernetesEngineConfig',
+ registry: 'default',
+ accept: '.yml, .yaml',
+ loading: false,
+ pasteOrUpload: false,
+ model: null,
+ initialVersion: null,
+ registryUrl: null,
+ registryUser: null,
+ registryPass: null,
+ clusterOptErrors: null,
+ nodeNameErrors: null,
existingNodes: null,
initialNodeCounts: null,
@@ -102,15 +102,17 @@ export default InputTextFile.extend(ClusterDriver, {
worker: true,
defaultDockerRootDir: null,
- windowsEnable: false,
- isLinux: true,
- windowsSupport: false,
- isNew: equal('mode', 'new'),
- isEdit: equal('mode', 'edit'),
- notView: or('isNew', 'isEdit'),
- clusterState: alias('model.originalCluster.state'),
+ windowsEnable: false,
+ isLinux: true,
+ windowsSupport: false,
+ isNew: equal('mode', 'new'),
+ isEdit: equal('mode', 'edit'),
+ notView: or('isNew', 'isEdit'),
+ clusterState: alias('model.originalCluster.state'),
+
// Custom stuff
- isCustom: equal('nodeWhich', 'custom'),
+ isCustom: equal('nodeWhich', 'custom'),
+
init() {
this._super();
@@ -367,6 +369,7 @@ export default InputTextFile.extend(ClusterDriver, {
versionChoices: computed('initialVersion', `settings.${ C.SETTING.VERSIONS_K8S }`, 'config.kubernetesVersion', function() {
const versions = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}');
+ const { experimentalVersion } = this;
if ( !versions ) {
return [];
@@ -393,7 +396,16 @@ export default InputTextFile.extend(ClusterDriver, {
}
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;
}
}),
+
+ experimentalVersion: C.EXPERIMENTAL_VERSIONS.RKE_K8S,
+
willSave() {
if ( get(this, 'registry') === 'custom' ) {
const registry = {
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
index 3b51a64b8..e55587ebe 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -35,31 +35,30 @@
{{copy-to-clipboard tooltipText="" buttonText="copyToClipboard.tooltip" clipboardText=value class="with-clip"}}
{{else}}
- {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
-
-
-
-
-
-
-
-
+ {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
+
+
+
+
+
+
+
+
+
-
- {{/if}}
+ {{/if}}
{{new-select
content=versionChoices
- optionLabelPath='value'
value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
}}
@@ -95,8 +94,8 @@
@@ -104,8 +103,8 @@
@@ -116,8 +115,8 @@
@@ -125,8 +124,8 @@
@@ -137,8 +136,8 @@