From c46b92de6e91e47e86f485ea24eab14936e0eccd Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Tue, 2 Oct 2018 16:07:50 -0700
Subject: [PATCH] Add experimental k8s version to rke cluster options

rancher/rancher#15919
---
 .../cluster-driver/driver-rke/component.js    | 71 ++++++++++-------
 .../cluster-driver/driver-rke/template.hbs    | 79 +++++++++----------
 lib/shared/addon/utils/constants.js           |  4 +
 3 files changed, 86 insertions(+), 68 deletions(-)

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 @@
         </div>
         {{copy-to-clipboard tooltipText="" buttonText="copyToClipboard.tooltip" clipboardText=value class="with-clip"}}
       {{else}}
-      {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
-        <div class="row">
-          <div class="col span-4">
-            <label class="acc-label">{{t 'clusterNew.rke.windowsSupport.label'}}</label>
-            <div class="radio">
-              <label>
-                {{radio-button selection=windowsSupport value=true }}
-                {{t 'generic.enabled'}}
-              </label>
-            </div>
-            <div class="radio">
-              <label>
-                {{radio-button selection=windowsSupport value=false }}
-                {{t 'generic.disabled'}}
-              </label>
+        {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
+          <div class="row">
+            <div class="col span-4">
+              <label class="acc-label">{{t 'clusterNew.rke.windowsSupport.label'}}</label>
+              <div class="radio">
+                <label>
+                  {{radio-button selection=windowsSupport value=true }}
+                  {{t 'generic.enabled'}}
+                </label>
+              </div>
+              <div class="radio">
+                <label>
+                  {{radio-button selection=windowsSupport value=false }}
+                  {{t 'generic.disabled'}}
+                </label>
+              </div>
             </div>
           </div>
-        </div>
-      {{/if}}
+        {{/if}}
         <div class="row">
           <div class="col span-4">
             <label class="acc-label">{{t 'clusterNew.rke.version.label'}}</label>
             {{new-select
                 content=versionChoices
-                optionLabelPath='value'
                 value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
             }}
           </div>
@@ -95,8 +94,8 @@
             <div class="radio">
               <label>
                 {{!--
-                    {{radio-button selection=nginxIngressProvider value="nginx"}}
-                    --}}
+                  {{radio-button selection=nginxIngressProvider value="nginx"}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="nginx"}}
                 {{t 'generic.enabled'}}
               </label>
@@ -104,8 +103,8 @@
             <div class="radio">
               <label>
                 {{!--
-                    {{radio-button selection=nginxIngressProvider value=null}}
-                    --}}
+                  {{radio-button selection=nginxIngressProvider value=null}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="none"}}
                 {{t 'generic.disabled'}}
               </label>
@@ -116,8 +115,8 @@
             <div class="radio">
               <label>
                 {{!--
-                    {{radio-button selection=monitoringProvider value="metrics-server"}}
-                    --}}
+                  {{radio-button selection=monitoringProvider value="metrics-server"}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}}
                 {{t 'generic.enabled'}}
               </label>
@@ -125,8 +124,8 @@
             <div class="radio">
               <label>
                 {{!--
-                    {{radio-button selection=monitoringProvider value=null}}
-                    --}}
+                  {{radio-button selection=monitoringProvider value=null}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}}
                 {{t 'generic.disabled'}}
               </label>
@@ -137,8 +136,8 @@
             <div class="radio">
               <label class={{unless model.psps.length 'text-muted'}}>
                 {{!--
-                    {{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}}
-                    --}}
+                  {{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=true disabled=(not model.psps.length)}}
                 {{t 'generic.enabled'}}
                 {{#unless model.psps.length}}
@@ -149,8 +148,8 @@
             <div class="radio">
               <label>
                 {{!--
-                    {{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}}
-                    --}}
+                  {{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}}
+                  --}}
                 {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=false disabled=(not model.psps.length)}}
                 {{t 'generic.disabled'}}
               </label>
@@ -241,11 +240,11 @@
   {{#accordion-list showExpandAll=false as |al expandFn|}}
     {{#if windowsSupport}}
       {{#accordion-list-item
-        title=(t 'clusterNew.rke.system.title')
-        detail=(t 'clusterNew.rke.system.detail')
-        expandOnInit=true
-        expandAll=al.expandAll
-        expand=(action expandFn)
+           title=(t 'clusterNew.rke.system.title')
+           detail=(t 'clusterNew.rke.system.detail')
+           expandOnInit=true
+           expandAll=al.expandAll
+           expand=(action expandFn)
       }}
         <div class="row">
           <div class="col span-6 text-center mt-0 mb-0">
@@ -356,11 +355,11 @@
                         <ul class="list-unstyled">
                           <li>
                             {{#form-user-labels
-                                setLabels=(action 'setLabels')
-                                expandAll=al.expandAll
-                                expand=(action expandFn)
-                                detailKey="formUserLabels.nodeDetail"
-                                as | userLabelArray removeLabel addUserLabel |
+                                 setLabels=(action 'setLabels')
+                                 expandAll=al.expandAll
+                                 expand=(action expandFn)
+                                 detailKey="formUserLabels.nodeDetail"
+                                 as | userLabelArray removeLabel addUserLabel |
                             }}
                               {{#if userLabelArray.length}}
                                 <table class="table fixed no-lines mt-20">
diff --git a/lib/shared/addon/utils/constants.js b/lib/shared/addon/utils/constants.js
index b74cee07d..94ab8cc39 100644
--- a/lib/shared/addon/utils/constants.js
+++ b/lib/shared/addon/utils/constants.js
@@ -693,4 +693,8 @@ C.NOTIFIER_TABLE_LABEL = {
   DEFAULT:   'Notifier',
 }
 
+C.EXPERIMENTAL_VERSIONS = {
+  RKE_K8S: 'v1.12.0-rancher1-1'
+}
+
 export default C;