From 3a534d9965774579c01e44d0699a9a0a2ad25a8b Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Thu, 1 Nov 2018 17:06:22 -0700 Subject: [PATCH] Tweak RKE Cluster Options based on feedback also addresses the windows support buttons not being enabled rancher/rancher#16396 rancher/rancher#16397 --- .../cluster-driver/driver-rke/component.js | 16 +- .../cluster-driver/driver-rke/template.hbs | 149 ++++++++---------- translations/en-us.yaml | 3 +- 3 files changed, 85 insertions(+), 83 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 b113ccf23..7b22b19b6 100644 --- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js @@ -46,9 +46,9 @@ const NETWORKCHOICES = [ }, ]; -const FLANNEL = 'flannel' -const CANAL = 'canal' -const HOST_GW = 'host-gw' +const FLANNEL = 'flannel' +const CANAL = 'canal' +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() { 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 09998cbb9..fc5fb9908 100644 --- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs @@ -71,8 +71,20 @@ value=cluster.rancherKubernetesEngineConfig.kubernetesVersion }} - {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}} -
+
+
+
+ + {{new-select + classNames="form-control" + content=networkContent + localizedLabel=true + value=cluster.rancherKubernetesEngineConfig.network.plugin + disabled=isEdit + }} +
+ {{#if (and isCustom (eq mode 'new'))}} +
{{/if}} -
-
-
- {{cru-cloud-provider - cluster=model.cluster - driver=nodeWhich - }} -
-
- {{/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) - }} -
-
- - {{new-select - classNames="form-control" - content=networkContent - localizedLabel=true - value=cluster.rancherKubernetesEngineConfig.network.plugin - disabled=isEdit - }} -
-
-
-
+
+
+
+
+ {{cru-cloud-provider + cluster=model.cluster + driver=nodeWhich + }} +
+
+ {{/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) + }} +
@@ -164,52 +178,29 @@ placeholder=(t 'clusterNew.rke.serviceNodePortRange.placeholder') }}
-
- {{/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) - }} -
-
- -
- -
-
- -
+
+ +
+
+
+ +
+
+
+
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index bb91af285..620d8ece0 100644 --- a/translations/en-us.yaml +++ b/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: