Merge pull request #2372 from westlywright/etcd-snapshot

Tweak RKE Cluster Options based on feedback

lib/shared/addon/components/cluster-driver/driver-rke/component.js

@@ -46,9 +46,9 @@ const NETWORKCHOICES = [
   },
 ];
 
-const FLANNEL = 'flannel'
+const FLANNEL              = 'flannel'
-const CANAL = 'canal'
+const CANAL                = 'canal'
-const HOST_GW = 'host-gw'
+const HOST_GW              = 'host-gw'
 const DEFAULT_BACKEND_TYPE = 'vxlan';
 
 const AUTHCHOICES = [
@@ -238,11 +238,21 @@ export default InputTextFile.extend(ClusterDriver, {
         }),
       });
 
+
       scheduleOnce('afterRender', () => {
         set(this, 'cluster.rancherKubernetesEngineConfig', rkeConfig);
         set(this, 'cluster.enableNetworkPolicy', false);
       });
     }
+
+    let { networkContent } = this;
+    let flannel = networkContent.findBy('value', 'flannel');
+
+    if (get(this, 'isCustom')) {
+      set(flannel, 'label', 'clusterNew.rke.network.flannelCustom');
+    } else {
+      set(flannel, 'label', 'clusterNew.rke.network.flannel');
+    }
   }),
 
   versionChanged: observer('config.kubernetesVersion', 'versionChoices.[]', function() {

lib/shared/addon/components/cluster-driver/driver-rke/template.hbs

@@ -71,8 +71,20 @@
                 value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
             }}
           </div>
-          {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
+        </div>
-            <div class="col span-6">
+        <div class="row">
+          <div class="col {{if (and isCustom (eq mode 'new')) "span-4" "span-6"}}">
+            <label class="acc-label">{{t 'clusterNew.rke.network.label'}}</label>
+            {{new-select
+                classNames="form-control"
+                content=networkContent
+                localizedLabel=true
+                value=cluster.rancherKubernetesEngineConfig.network.plugin
+                disabled=isEdit
+            }}
+          </div>
+          {{#if (and isCustom (eq mode 'new'))}}
+            <div class="col span-4">
               <label class="acc-label">{{t 'clusterNew.rke.windowsSupport.label'}}</label>
               <div class="radio">
                 <label class={{if (not-eq config.network.plugin 'flannel') 'text-muted'}}>
@@ -88,38 +100,7 @@
               </div>
             </div>
           {{/if}}
-        </div>
+          <div class="col {{if (and isCustom (eq mode 'new')) "span-4" "span-6"}}">
-        <div class="row">
-          <div class="col span-12">
-            {{cru-cloud-provider
-                cluster=model.cluster
-                driver=nodeWhich
-            }}
-          </div>
-        </div>
-      {{/accordion-list-item}}
-
-      {{#accordion-list-item
-           title=(t 'clusterNew.rke.network.title')
-           detail=(t 'clusterNew.rke.network.detail')
-           expandOnInit=(eq mode "edit" true false)
-           expandAll=al.expandAll
-           expand=(action expandFn)
-      }}
-        <div class="row">
-          <div class="col span-4">
-            <label class="acc-label">{{t 'clusterNew.rke.network.label'}}</label>
-            {{new-select
-                classNames="form-control"
-                content=networkContent
-                localizedLabel=true
-                value=cluster.rancherKubernetesEngineConfig.network.plugin
-                disabled=isEdit
-            }}
-          </div>
-        </div>
-        <div class="row">
-          <div class="col span-4">
             <label class="acc-label">{{t 'clusterNew.rke.networkPolicy.label'}}</label>
             <div class="radio">
               <label class={{unless (eq cluster.rancherKubernetesEngineConfig.network.plugin "canal")  'text-muted'}}>
@@ -134,6 +115,39 @@
               </label>
             </div>
           </div>
+        </div>
+        <div class="row">
+          <div class="col span-12">
+            {{cru-cloud-provider
+                cluster=model.cluster
+                driver=nodeWhich
+            }}
+          </div>
+        </div>
+      {{/accordion-list-item}}
+
+      {{#advanced-section advanced=advanced}}
+        {{#accordion-list-item
+             title=(t 'cruPrivateRegistry.title.label')
+             detail=(t 'cruPrivateRegistry.title.detail')
+             expandOnInit=(eq mode "edit" true false)
+             expandAll=al.expandAll
+             expand=(action expandFn)
+        }}
+          {{cru-private-registry
+              cluster=cluster
+          }}
+        {{/accordion-list-item}}
+
+
+        {{#accordion-list-item
+             title=(t 'clusterNew.rke.advanced.label')
+             detail=(t 'clusterNew.rke.advanced.detail')
+             expandOnInit=(eq mode "edit" true false)
+             expandAll=al.expandAll
+             expand=(action expandFn)
+        }}
+        <div class="row">
           <div class="col span-4">
             <label class="acc-label">{{t 'clusterNew.rke.ingress.label'}}</label>
             <div class="radio">
@@ -164,52 +178,29 @@
                 placeholder=(t 'clusterNew.rke.serviceNodePortRange.placeholder')
             }}
           </div>
-        </div>
+          <div class="col span-4">
-      {{/accordion-list-item}}
+            <label class="acc-label">{{t 'clusterNew.rke.monitoring.label'}}</label>
-
+            <div class="radio">
-      {{#advanced-section advanced=advanced}}
+              <label>
-        {{#accordion-list-item
+                {{!--
-             title=(t 'cruPrivateRegistry.title.label')
+                      {{radio-button selection=monitoringProvider value="metrics-server"}}
-             detail=(t 'cruPrivateRegistry.title.detail')
+                      --}}
-             expandOnInit=(eq mode "edit" true false)
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}}
-             expandAll=al.expandAll
+                {{t 'generic.enabled'}}
-             expand=(action expandFn)
+              </label>
-        }}
-          {{cru-private-registry
-              cluster=cluster
-          }}
-        {{/accordion-list-item}}
-
-
-        {{#accordion-list-item
-             title=(t 'clusterNew.rke.advanced.label')
-             detail=(t 'clusterNew.rke.advanced.detail')
-             expandOnInit=(eq mode "edit" true false)
-             expandAll=al.expandAll
-             expand=(action expandFn)
-        }}
-          <div class="row">
-            <div class="col span-4">
-              <label class="acc-label">{{t 'clusterNew.rke.monitoring.label'}}</label>
-              <div class="radio">
-                <label>
-                  {{!--
-                  {{radio-button selection=monitoringProvider value="metrics-server"}}
-                  --}}
-                  {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}}
-                  {{t 'generic.enabled'}}
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  {{!--
-                  {{radio-button selection=monitoringProvider value=null}}
-                  --}}
-                  {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}}
-                  {{t 'generic.disabled'}}
-                </label>
-              </div>
             </div>
+            <div class="radio">
+              <label>
+                {{!--
+                      {{radio-button selection=monitoringProvider value=null}}
+                      --}}
+                {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}}
+                {{t 'generic.disabled'}}
+              </label>
+            </div>
+          </div>
+        </div>
+          <div class="row">
             <div class="col span-4">
               <label class="acc-label">{{t 'clusterNew.rke.podSecurityPolicy.label'}}</label>
               <div class="radio">

translations/en-us.yaml

@@ -2132,8 +2132,9 @@ clusterNew:
       detail: Configure the networking for the cluster
       label: Network Provider
       flannel: Flannel
+      flannelCustom: Flannel (Windows Support Available)
       calico: Calico
-      canal: Canal
+      canal: Canal (Network Isolation Available)
       options:
         flannel:
           iface: