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

Merge pull request #2635 from loganhz/aliyun-version 

Support alibaba ACK managed kubernetes
This commit is contained in:
Westly Wright 2019-02-16 08:08:03 -07:00 committed by GitHub
parent b743a6167a 608ef27cf8
commit b34426e1e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 144 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,9 @@ 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];
{ const KUBERNETES = 'Kubernetes';
label: K8S_1_11_5, const MANAGED = 'ManagedKubernetes'
value: K8S_1_11_5
}
];
const DISKS = [ const DISKS = [
{ {
@ -29,25 +26,39 @@ const DISKS = [
} }
]; ];
const CLUSTER_TYPES = [
{
label: 'clusterNew.aliyunkcs.clusters.k8s',
value: KUBERNETES
},
{
label: 'clusterNew.aliyunkcs.clusters.managed',
value: MANAGED
}
];
const REGIONS = [ const REGIONS = [
{ {
label: 'cn-qingdao', label: 'cn-qingdao',
value: 'cn-qingdao' value: 'cn-qingdao',
}, { }, {
label: 'cn-beijing', label: 'cn-beijing',
value: 'cn-beijing' value: 'cn-beijing',
managed: true,
}, { }, {
label: 'cn-zhangjiakou', label: 'cn-zhangjiakou',
value: 'cn-zhangjiakou' value: 'cn-zhangjiakou'
}, { }, {
label: 'cn-shanghai', label: 'cn-shanghai',
value: 'cn-shanghai' value: 'cn-shanghai',
managed: true,
}, { }, {
label: 'cn-shenzhen', label: 'cn-shenzhen',
value: 'cn-shenzhen' value: 'cn-shenzhen'
}, { }, {
label: 'cn-hangzhou', label: 'cn-hangzhou',
value: 'cn-hangzhou' value: 'cn-hangzhou',
managed: true,
}, { }, {
label: 'cn-hongkong', label: 'cn-hongkong',
value: 'cn-hongkong' value: 'cn-hongkong'
@ -58,17 +69,20 @@ const REGIONS = [
label: 'ap-northeast-1', label: 'ap-northeast-1',
value: 'ap-northeast-1' value: 'ap-northeast-1'
}, { }, {
label: 'ap-south-1', label: 'ap-south-1',
value: 'ap-south-1' value: 'ap-south-1',
managed: true,
}, { }, {
label: 'ap-southeast-1', label: 'ap-southeast-1',
value: 'ap-southeast-1' value: 'ap-southeast-1',
managed: true,
}, { }, {
label: 'ap-southeast-2', label: 'ap-southeast-2',
value: 'ap-southeast-2' value: 'ap-southeast-2'
}, { }, {
label: 'ap-southeast-5', label: 'ap-southeast-5',
value: 'ap-southeast-5' value: 'ap-southeast-5',
managed: true,
}, { }, {
label: 'us-east-1', label: 'us-east-1',
value: 'us-east-1' value: 'us-east-1'
@ -82,8 +96,9 @@ const REGIONS = [
label: 'eu-central-1', label: 'eu-central-1',
value: 'eu-central-1' value: 'eu-central-1'
}, { }, {
label: 'ap-southeast-3', label: 'ap-southeast-3',
value: 'ap-southeast-3' value: 'ap-southeast-3',
managed: true,
}]; }];
export default Component.extend(ClusterDriver, { export default Component.extend(ClusterDriver, {
@ -103,7 +118,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);
@ -116,7 +130,8 @@ export default Component.extend(ClusterDriver, {
accessKeyId: null, accessKeyId: null,
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,
@ -195,19 +210,10 @@ export default Component.extend(ClusterDriver, {
return; return;
} }
this.setInstances();
const instances = get(this, 'selectedZone.raw.AvailableInstanceTypes.InstanceTypes'); const instances = get(this, 'selectedZone.raw.AvailableInstanceTypes.InstanceTypes');
set(this, 'instanceChoices', instances.map((i) => {
const g = i.split('.')[1];
return {
group: g,
label: i,
value: i
}
}));
const found = instances.indexOf(get(this, 'config.masterInstanceType')); const found = instances.indexOf(get(this, 'config.masterInstanceType'));
if ( !found ) { if ( !found ) {
@ -219,12 +225,13 @@ export default Component.extend(ClusterDriver, {
}, },
configWorker(cb) { configWorker(cb) {
this.setInstances();
const errors = get(this, 'errors') || []; const errors = get(this, 'errors') || [];
const intl = get(this, 'intl'); const intl = get(this, 'intl');
const masterInstanceType = get(this, 'config.masterInstanceType'); const masterInstanceType = get(this, 'config.masterInstanceType');
if ( !masterInstanceType ) { if ( !masterInstanceType && get(this, 'config.clusterType') === KUBERNETES ) {
errors.push(intl.t('clusterNew.aliyunkcs.instanceType.required')); errors.push(intl.t('clusterNew.aliyunkcs.instanceType.required'));
} }
@ -296,6 +303,30 @@ export default Component.extend(ClusterDriver, {
return zoneChoices.findBy('value', get(this, 'config.zoneId')); return zoneChoices.findBy('value', get(this, 'config.zoneId'));
}), }),
clusterTypeChoices: computed('config.regionId', 'zoneChoices', function() {
const region = REGIONS.findBy('value', get(this, 'config.regionId'));
if ( region && get(region, 'managed') ) {
return CLUSTER_TYPES;
} else {
return CLUSTER_TYPES.filter((type) => get(type, 'value') !== MANAGED);
}
}),
setInstances() {
const instances = get(this, 'selectedZone.raw.AvailableInstanceTypes.InstanceTypes');
set(this, 'instanceChoices', instances.map((i) => {
const g = i.split('.')[1];
return {
group: g,
label: i,
value: i
}
}));
},
fetch(resource, plural, page = 1) { fetch(resource, plural, page = 1) {
set(this, 'errors', []); set(this, 'errors', []);
let ecs = get(this, 'ecsClient'); let ecs = get(this, 'ecsClient');

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

@ -1,13 +1,13 @@
{{#accordion-list showExpandAll=false as | al expandFn |}} {{#accordion-list showExpandAll=false as | al expandFn |}}
{{#accordion-list-item title=(t 'clusterNew.aliyunkcs.access.title') {{#accordion-list-item title=(t "clusterNew.aliyunkcs.access.title")
detail=(t 'clusterNew.aliyunkcs.access.detail') detail=(t "clusterNew.aliyunkcs.access.detail")
expandAll=expandAll expandAll=expandAll
expand=(action expandFn) expand=(action expandFn)
expandOnInit=true expandOnInit=true
}} }}
<div class="row"> <div class="row">
<div class="col span-4"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.regionId.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.regionId.label"}}</label>
{{#if (eq step 1)}} {{#if (eq step 1)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=regionChoices content=regionChoices
@ -18,12 +18,12 @@
{{/if}} {{/if}}
</div> </div>
<div class="col span-4"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.accessKeyId.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.accessKeyId.label"}}{{field-required}}</label>
{{#if (eq step 1)}} {{#if (eq step 1)}}
{{input type="text" {{input type="text"
name="username" name="username"
classNames="form-control" classNames="form-control"
placeholder=(t 'clusterNew.aliyunkcs.accessKeyId.placeholder') placeholder=(t "clusterNew.aliyunkcs.accessKeyId.placeholder")
value=config.accessKeyId value=config.accessKeyId
}} }}
{{else}} {{else}}
@ -31,17 +31,17 @@
{{/if}} {{/if}}
</div> </div>
<div class="col span-4"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.accessKeySecret.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.accessKeySecret.label"}}{{field-required}}</label>
{{#if (eq step 1)}} {{#if (eq step 1)}}
{{input type="password" name="password" classNames="form-control" placeholder=(t 'clusterNew.aliyunkcs.accessKeySecret.placeholder') value=config.accessKeySecret}} {{input type="password" name="password" classNames="form-control" placeholder=(t "clusterNew.aliyunkcs.accessKeySecret.placeholder") value=config.accessKeySecret}}
{{else}} {{else}}
<div class="text-muted text-italic">{{t 'clusterNew.aliyunkcs.accessKeySecret.provided'}}</div> <div class="text-muted text-italic">{{t "clusterNew.aliyunkcs.accessKeySecret.provided"}}</div>
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{/accordion-list-item}} {{/accordion-list-item}}
{{#if (eq step 1)}} {{#if (eq step 1)}}
{{save-cancel editing=(eq mode 'edit') {{save-cancel editing=(eq mode "edit")
save="aliyunLogin" save="aliyunLogin"
cancel=close cancel=close
createLabel="clusterNew.aliyunkcs.access.next" createLabel="clusterNew.aliyunkcs.access.next"
@ -49,27 +49,42 @@
}} }}
{{/if}} {{/if}}
{{#if (gte step 2)}} {{#if (gte step 2)}}
{{#accordion-list-item title=(t 'clusterNew.aliyunkcs.cluster.title') {{#accordion-list-item title=(t "clusterNew.aliyunkcs.cluster.title")
detail=(t 'clusterNew.aliyunkcs.cluster.detail') detail=(t "clusterNew.aliyunkcs.cluster.detail")
showExpand=false showExpand=false
expandOnInit=true expandOnInit=true
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.version.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.clusters.label"}}{{field-required}}</label>
{{#if (eq step 2)}} {{#if (eq step 2)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=versionChoices content=clusterTypeChoices
value=version value=config.clusterType
localizedLabel=true
}} }}
{{else}} {{else}}
<div>{{version}}</div> <div>{{config.clusterType}}</div>
{{/if}} {{/if}}
</div> </div>
<div class="col span-6"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.zoneId.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.version.label"}}</label>
{{#if (eq step 2)}}
{{form-versions
cluster=cluster
editing=(eq mode "edit")
value=config.kubernetesVersion
versions=versionChoices
initialVersion=config.version
}}
{{else}}
<div>{{config.version}}</div>
{{/if}}
</div>
<div class="col span-4">
<label class="acc-label">{{t "clusterNew.aliyunkcs.zoneId.label"}}{{field-required}}</label>
{{#if (eq step 2)}} {{#if (eq step 2)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=zoneChoices content=zoneChoices
@ -81,18 +96,25 @@
</div> </div>
</div> </div>
{{/accordion-list-item}} {{/accordion-list-item}}
{{#if (eq step 2)}} {{#if (and (eq step 2) (eq config.clusterType "Kubernetes"))}}
{{save-cancel editing=(eq mode 'edit') {{save-cancel editing=(eq mode "edit")
save="configMaster" save="configMaster"
cancel=close cancel=close
createLabel="clusterNew.aliyunkcs.cluster.next" createLabel="clusterNew.aliyunkcs.cluster.next"
savingLabel="clusterNew.aliyunkcs.cluster.loading" savingLabel="clusterNew.aliyunkcs.cluster.loading"
}} }}
{{else if (and (eq step 2) (eq config.clusterType "ManagedKubernetes"))}}
{{save-cancel editing=(eq mode "edit")
save="configWorker"
cancel=close
createLabel="clusterNew.aliyunkcs.master.next"
savingLabel="clusterNew.aliyunkcs.master.loading"
}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if (gte step 3)}} {{#if (and (gte step 3) (eq config.clusterType "Kubernetes"))}}
{{#accordion-list-item title=(t 'clusterNew.aliyunkcs.master.title') {{#accordion-list-item title=(t "clusterNew.aliyunkcs.master.title")
detail=(t 'clusterNew.aliyunkcs.master.detail') detail=(t "clusterNew.aliyunkcs.master.detail")
showExpand=false showExpand=false
expandOnInit=true expandOnInit=true
expandAll=al.expandAll expandAll=al.expandAll
@ -100,7 +122,7 @@
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.instanceType.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.instanceType.label"}}{{field-required}}</label>
{{#if (eq step 3)}} {{#if (eq step 3)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=instanceChoices content=instanceChoices
@ -111,13 +133,13 @@
{{/if}} {{/if}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.masterNum.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.masterNum.label"}}</label>
<div>3</div> <div>3</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.rootType.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.rootType.label"}}</label>
{{#if (eq step 3)}} {{#if (eq step 3)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=diskChoices content=diskChoices
@ -129,20 +151,20 @@
{{/if}} {{/if}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.rootSize.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.rootSize.label"}}</label>
{{#if (eq step 3)}} {{#if (eq step 3)}}
<div class="input-group"> <div class="input-group">
{{input-integer min=40 max=500 value=config.masterSystemDiskSize classNames="form-control" placeholder=(t 'clusterNew.aliyunkcs.rootSize.placeholder')}} {{input-integer min=40 max=500 value=config.masterSystemDiskSize classNames="form-control" placeholder=(t "clusterNew.aliyunkcs.rootSize.placeholder")}}
<span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span> <span class="input-group-addon bg-default">{{t "generic.gigabyte"}}</span>
</div> </div>
{{else}} {{else}}
<div>{{config.masterSystemDiskSize}} {{t 'generic.gigabyte'}}</div> <div>{{config.masterSystemDiskSize}} {{t "generic.gigabyte"}}</div>
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{/accordion-list-item}} {{/accordion-list-item}}
{{#if (eq step 3)}} {{#if (eq step 3)}}
{{save-cancel editing=(eq mode 'edit') {{save-cancel editing=(eq mode "edit")
save="configWorker" save="configWorker"
cancel=close cancel=close
createLabel="clusterNew.aliyunkcs.master.next" createLabel="clusterNew.aliyunkcs.master.next"
@ -151,8 +173,8 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if (gte step 4)}} {{#if (gte step 4)}}
{{#accordion-list-item title=(t 'clusterNew.aliyunkcs.worker.title') {{#accordion-list-item title=(t "clusterNew.aliyunkcs.worker.title")
detail=(t 'clusterNew.aliyunkcs.worker.detail') detail=(t "clusterNew.aliyunkcs.worker.detail")
showExpand=false showExpand=false
expandOnInit=true expandOnInit=true
expandAll=al.expandAll expandAll=al.expandAll
@ -160,7 +182,7 @@
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.instanceType.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.instanceType.label"}}{{field-required}}</label>
{{#if (eq step 4)}} {{#if (eq step 4)}}
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=instanceChoices content=instanceChoices
@ -171,11 +193,11 @@
{{/if}} {{/if}}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.numOfNodes.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.numOfNodes.label"}}</label>
{{#if (eq step 4)}} {{#if (eq step 4)}}
{{input-integer min=0 max=300 value=config.numOfNodes classNames="form-control" placeholder=(t 'clusterNew.aliyunkcs.numOfNodes.placeholder')}} {{input-integer min=0 max=300 value=config.numOfNodes classNames="form-control" placeholder=(t "clusterNew.aliyunkcs.numOfNodes.placeholder")}}
<p class="help-block"> <p class="help-block">
{{t 'clusterNew.aliyunkcs.numOfNodes.help'}} {{t "clusterNew.aliyunkcs.numOfNodes.help"}}
</p> </p>
{{else}} {{else}}
<div>{{config.numOfNodes}}</div> <div>{{config.numOfNodes}}</div>
@ -184,7 +206,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.rootType.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.rootType.label"}}</label>
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=diskChoices content=diskChoices
localizedLabel=true localizedLabel=true
@ -192,16 +214,16 @@
}} }}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.rootSize.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.rootSize.label"}}</label>
<div class="input-group"> <div class="input-group">
{{input-integer min=40 max=500 value=config.workerSystemDiskSize classNames="form-control" placeholder=(t 'clusterNew.aliyunkcs.rootSize.placeholder')}} {{input-integer min=40 max=500 value=config.workerSystemDiskSize classNames="form-control" placeholder=(t "clusterNew.aliyunkcs.rootSize.placeholder")}}
<span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span> <span class="input-group-addon bg-default">{{t "generic.gigabyte"}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.storageType.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.storageType.label"}}</label>
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=diskChoices content=diskChoices
localizedLabel=true localizedLabel=true
@ -209,16 +231,16 @@
}} }}
</div> </div>
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.storageSize.label'}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.storageSize.label"}}</label>
<div class="input-group"> <div class="input-group">
{{input-integer min=40 max=32768 value=config.workerDataDiskSize classNames="form-control" placeholder=(t 'clusterNew.aliyunkcs.rootSize.placeholder')}} {{input-integer min=40 max=32768 value=config.workerDataDiskSize classNames="form-control" placeholder=(t "clusterNew.aliyunkcs.rootSize.placeholder")}}
<span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span> <span class="input-group-addon bg-default">{{t "generic.gigabyte"}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
<label class="acc-label">{{t 'clusterNew.aliyunkcs.keyPair.label'}}{{field-required}}</label> <label class="acc-label">{{t "clusterNew.aliyunkcs.keyPair.label"}}{{field-required}}</label>
{{searchable-select class="form-control" {{searchable-select class="form-control"
content=keyChoices content=keyChoices
value=config.keyPair value=config.keyPair
@ -227,7 +249,7 @@
</div> </div>
{{/accordion-list-item}} {{/accordion-list-item}}
{{#if (eq step 4)}} {{#if (eq step 4)}}
{{save-cancel editing=(eq mode 'edit') {{save-cancel editing=(eq mode "edit")
save="save" save="save"
cancel=close cancel=close
}} }}

4
translations/en-us.yaml
View File

@ -2390,6 +2390,10 @@ clusterNew:
detail: Choose the Zone and Kubernetes version that will be used to launch Alibaba Kubernetes Service detail: Choose the Zone and Kubernetes version that will be used to launch Alibaba Kubernetes Service
next: "Next: Configure Master Nodes" next: "Next: Configure Master Nodes"
loading: "Loading Availability Zones from Alibaba" loading: "Loading Availability Zones from Alibaba"
clusters:
k8s: Kubernetes
managed: Managed Kubernetes
label: Cluster Type
master: master:
title: Master Nodes title: Master Nodes
detail: Configure the master nodes that will be used to launch Alibaba Kubernetes Service detail: Configure the master nodes that will be used to launch Alibaba Kubernetes Service

6
translations/zh-hans.yaml
View File

@ -2400,7 +2400,11 @@ clusterNew:
title: 集群配置 title: 集群配置
detail: 选择阿里云Kubernetes服务中使用的可用区和Kubernetes版本 detail: 选择阿里云Kubernetes服务中使用的可用区和Kubernetes版本
next: "下一步: 设置Master节点" next: "下一步: 设置Master节点"
loading: "Loading Availability Zones from Aliyun" loading: "从阿里云获取可用区列表"
clusters:
k8s: Kubernetes
managed: Kubernetes托管版
label: 集群类型
master: master:
title: Master节点 title: Master节点
detail: 配置阿里云Kubernetes服务中的Master节点 detail: 配置阿里云Kubernetes服务中的Master节点