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

Support k8s version for aliyun hosted k8s 

https://github.com/rancher/rancher/issues/17827
This commit is contained in:
loganhz 2019-02-10 13:57:24 +08:00
parent c607a22adf
commit d2732ec901
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/shared/addon/components/cluster-driver/driver-aliyunkcs/component.js
View File

@ -11,12 +11,7 @@ const ENDPOINT = 'ecs.aliyuncs.com';
const PAGE_SIZE = 50; const PAGE_SIZE = 50;
const K8S_1_11_5 = '1.11.5'; const K8S_1_11_5 = '1.11.5';
const VERSIONS = [ const VERSIONS = [K8S_1_11_5];
{
label: K8S_1_11_5,
value: K8S_1_11_5
}
];
const DISKS = [ const DISKS = [
{ {
@ -103,7 +98,6 @@ export default Component.extend(ClusterDriver, {
keyChoices: null, keyChoices: null,
allSubnets: null, allSubnets: null,
allInstances: null, allInstances: null,
version: K8S_1_11_5,
init() { init() {
this._super(...arguments); this._super(...arguments);
@ -117,6 +111,7 @@ export default Component.extend(ClusterDriver, {
accessKeySecret: null, accessKeySecret: null,
regionId: 'cn-beijing', regionId: 'cn-beijing',
clusterType: 'Kubernetes', clusterType: 'Kubernetes',
kubernetesVersion: K8S_1_11_5,
zoneId: null, zoneId: null,
snatEntry: true, snatEntry: true,
publicSlb: true, publicSlb: true,

9
lib/shared/addon/components/cluster-driver/driver-aliyunkcs/template.hbs
View File

@ -60,9 +60,12 @@
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.version.label'}}</label> <label class="acc-label">{{t 'clusterNew.aliyunkcs.version.label'}}</label>
{{#if (eq step 2)}} {{#if (eq step 2)}}
{{searchable-select class="form-control" {{form-versions
content=versionChoices cluster=cluster
value=version editing=(eq mode "edit")
value=config.kubernetesVersion
versions=versionChoices
initialVersion=config.version
}} }}
{{else}} {{else}}
<div>{{version}}</div> <div>{{version}}</div>