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

Merge pull request #3303 from loganhz/win 

[2.3.0]Disable Windows in k8s 1.14
This commit is contained in:
Vincent Fiduccia 2019-08-29 09:16:54 -07:00 committed by GitHub
parent 867306f133 86096ee6bc
commit eeb6fd8a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1188,7 +1188,7 @@
</ul> </ul>
</li> </li>
<li> <li>
{{t (if isLinux "clusterNew.rke.command.instructions" "clusterNew.rke.command.winInstructions") htmlSafe=true version="1809"}} {{t (if isLinux "clusterNew.rke.command.instructions" "clusterNew.rke.command.winInstructions") htmlSafe=true version="1903"}}
{{!-- <p class="help-block">{{t "clusterNew.rke.labels.detail"}}</p> --}} {{!-- <p class="help-block">{{t "clusterNew.rke.labels.detail"}}</p> --}}
<ul class="list-unstyled"> <ul class="list-unstyled">
<li> <li>

2
lib/shared/addon/components/form-network-config/component.js
View File

@ -138,7 +138,7 @@ export default Component.extend({
const kubernetesVersion = get(this, 'config.kubernetesVersion'); const kubernetesVersion = get(this, 'config.kubernetesVersion');
return plugin === FLANNEL && gte(coerceVersion(kubernetesVersion), 'v1.14.1'); return plugin === FLANNEL && gte(coerceVersion(kubernetesVersion), 'v1.15.3');
}), }),
projectNetworkIsolationAvailable: computed('config.network.plugin', function() { projectNetworkIsolationAvailable: computed('config.network.plugin', function() {

2
translations/en-us.yaml
View File

@ -3434,7 +3434,7 @@ clusterNew:
windows: Windows windows: Windows
windowsSupport: windowsSupport:
label: Windows Support label: Windows Support
help: Available for Kubernetes 1.14 with Flannel network provider. help: Available for Kubernetes 1.15 with Flannel network provider.
disabled: Not support {plugin} network provider. disabled: Not support {plugin} network provider.
advanced: advanced:
label: Advanced Options label: Advanced Options