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

Merge pull request #2487 from loganhz/cluster-yaml 

Fix windows option issue
This commit is contained in:
Westly Wright 2018-12-10 10:19:24 -07:00 committed by GitHub
parent 447f8a5e72 6edbb6377b
commit dd923f7e1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ export default InputTextFile.extend(ClusterDriver, {
set(this, 'defaultDockerRootDir', defaultCluster.dockerRootDir) set(this, 'defaultDockerRootDir', defaultCluster.dockerRootDir)
if (get(this, 'isEdit')) { if (get(this, 'isEdit')) {
if (get(this, 'config.network.options.flannel_backend_type') === HOST_GW) { if (get(this, 'config.network.options.flannelBackendType') === HOST_GW) {
set(this, 'windowsSupport', true) set(this, 'windowsSupport', true)
} }
} }
@ -212,7 +212,7 @@ export default InputTextFile.extend(ClusterDriver, {
network: globalStore.createRecord({ network: globalStore.createRecord({
type: 'networkConfig', type: 'networkConfig',
plugin: 'canal', plugin: 'canal',
options: { flannel_backend_type: DEFAULT_BACKEND_TYPE, }, options: { flannelBackendType: DEFAULT_BACKEND_TYPE, },
}), }),
ingress: globalStore.createRecord({ ingress: globalStore.createRecord({
type: 'ingressConfig', type: 'ingressConfig',
@ -271,9 +271,9 @@ export default InputTextFile.extend(ClusterDriver, {
const config = get(this, 'cluster.rancherKubernetesEngineConfig') const config = get(this, 'cluster.rancherKubernetesEngineConfig')
if (windowsSupport) { if (windowsSupport) {
set(config, 'network.options.flannel_backend_type', HOST_GW) set(config, 'network.options.flannelBackendType', HOST_GW)
} else { } else {
set(config, 'network.options.flannel_backend_type', DEFAULT_BACKEND_TYPE) set(config, 'network.options.flannelBackendType', DEFAULT_BACKEND_TYPE)
} }
}), }),

2
lib/shared/addon/components/input-yaml/template.hbs
View File

@ -17,7 +17,7 @@
<h1>{{title}}</h1> <h1>{{title}}</h1>
</section> </section>
{{else}} {{else}}
<div class="text-right"> <div class="text-right mb-20">
{{#if showUpload}} {{#if showUpload}}
<button class="btn bg-link icon-btn" {{action "click"}}> <button class="btn bg-link icon-btn" {{action "click"}}>
<span class="darken"><i class="icon icon-upload text-small"/></span> <span class="darken"><i class="icon icon-upload text-small"/></span>