rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2372 from westlywright/etcd-snapshot 

Tweak RKE Cluster Options based on feedback
This commit is contained in:
Westly Wright 2018-11-05 10:35:47 -07:00 committed by GitHub
parent a5540a70e2 3a534d9965
commit 24fed4408a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {

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

@ -71,8 +71,20 @@
value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
}}
</div>
{{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
<div class="col span-6">
</div>
<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="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">
<div class="col {{if (and isCustom (eq mode 'new')) "span-4" "span-6"}}">
<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,31 +178,6 @@
placeholder=(t 'clusterNew.rke.serviceNodePortRange.placeholder')
}}
</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.monitoring.label'}}</label>
<div class="radio">
@ -210,6 +199,8 @@
</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">

3
translations/en-us.yaml
View File

@ -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: