Update for review

This commit is contained in:
n313893254 2019-02-01 10:32:01 +08:00
parent 2e1124eaf0
commit 7b72ef82f5
3 changed files with 82 additions and 101 deletions

View File

@ -3,8 +3,8 @@
{{#if (eq step 1) }}
{{#accordion-list-item
title=(t 'clusterNew.azureaks.access.title')
detail=(t 'clusterNew.azureaks.access.detail')
title=(t "clusterNew.azureaks.access.title")
detail=(t "clusterNew.azureaks.access.detail")
showExpand=false
expandOnInit=true
expandAll=al.expandAll
@ -12,7 +12,7 @@
}}
<div class="row">
<div class="col span-6 mb-0">
<label class="acc-label" for="azureaks-subscription-id" >{{t 'clusterNew.azureaks.subscriptionId.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-subscription-id" >{{t "clusterNew.azureaks.subscriptionId.label"}}{{field-required}}</label>
{{#input-or-display
editable=isEditable
value=config.subscriptionId
@ -20,14 +20,14 @@
{{input
classNames="form-control"
id="azureaks-subscription-id"
placeholder=(t 'clusterNew.azureaks.subscriptionId.placeholder')
placeholder=(t "clusterNew.azureaks.subscriptionId.placeholder")
type="text"
value=config.subscriptionId
}}
{{/input-or-display}}
</div>
<div class="col span-6 mb-0">
<label class="acc-label" for="azureaks-tenant-id">{{t 'clusterNew.azureaks.tenant.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-tenant-id">{{t "clusterNew.azureaks.tenant.label"}}{{field-required}}</label>
{{#input-or-display
editable=isEditable
value=config.tenantId
@ -35,7 +35,7 @@
{{input type="text"
classNames="form-control"
id="azureaks-tenant-id"
placeholder=(t 'clusterNew.azureaks.tenant.placeholder')
placeholder=(t "clusterNew.azureaks.tenant.placeholder")
value=config.tenantId
}}
{{/input-or-display}}
@ -44,7 +44,7 @@
<div class="row">
<div class="col span-6 mb-0">
<label class="acc-label" for="azureaks-client-id">{{t 'clusterNew.azureaks.clientId.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-client-id">{{t "clusterNew.azureaks.clientId.label"}}{{field-required}}</label>
{{#input-or-display
editable=isEditable
value=config.clientId
@ -52,7 +52,7 @@
{{input
classNames="form-control"
id="azureaks-client-id"
placeholder=(t 'clusterNew.azureaks.clientId.placeholder')
placeholder=(t "clusterNew.azureaks.clientId.placeholder")
type="text"
value=config.clientId
}}
@ -60,11 +60,11 @@
</div>
<div class="col span-6 mb-0">
<label class="acc-label" for="azureaks-client-secret">{{t 'clusterNew.azureaks.clientSecret.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-client-secret">{{t "clusterNew.azureaks.clientSecret.label"}}{{field-required}}</label>
{{input
classNames="form-control"
id="azureaks-client-secret"
placeholder=(t 'clusterNew.azureaks.clientSecret.placeholder')
placeholder=(t "clusterNew.azureaks.clientSecret.placeholder")
type="password"
value=config.clientSecret
}}
@ -72,7 +72,7 @@
</div>
<div class="row">
<div class="col span-6">
<label class="acc-label" for="azureaks-location">{{t 'clusterNew.azureaks.location.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-location">{{t "clusterNew.azureaks.location.label"}}{{field-required}}</label>
{{#input-or-display
editable=isEditable
value=config.location
@ -93,7 +93,7 @@
{{#unless editing}}
<div class="row">
<div class="col span-12 m-0">
{{banner-message color="bg-info" icon="icon-help" class="mb-0" message=(t 'clusterNew.azureaks.access.help' htmlSafe=true)}}
{{banner-message color="bg-info" icon="icon-help" class="mb-0" message=(t "clusterNew.azureaks.access.help" htmlSafe=true)}}
</div>
</div>
{{/unless}}
@ -110,26 +110,26 @@
{{#if (gte step 2) }}
{{#accordion-list-item
title=(t 'clusterNew.customize.title')
detail=(t 'clusterNew.customize.detail')
title=(t "clusterNew.customize.title")
detail=(t "clusterNew.customize.detail")
expandAll=al.expandAll
expandOnInit=true
expand=(action expandFn)
}}
<div class="row">
<div class="col span-6">
<label class="acc-label" for="azureaks-kube-version">{{t 'clusterNew.azureaks.kubernetesVersion.label'}}</label>
<label class="acc-label" for="azureaks-kube-version">{{t "clusterNew.azureaks.kubernetesVersion.label"}}</label>
{{form-versions
cluster=cluster
editing=(eq mode 'edit')
editing=(eq mode "edit")
initialVersion=config.kubernetesVersion
value=config.kubernetesVersion
versions=versions
}}
</div>
<div class="col span-6">
<label class="acc-label" for="azureaks-master-dns-prefix">{{t 'clusterNew.azureaks.dns.label'}}</label>
<label class="acc-label" for="azureaks-master-dns-prefix">{{t "clusterNew.azureaks.dns.label"}}</label>
{{#input-or-display
editable=isNew
value=config.masterDnsPrefix
@ -137,7 +137,7 @@
{{input
classNames="form-control"
id="azureaks-master-dns-prefix"
placeholder=(t 'clusterNew.azureaks.dns.placeholder')
placeholder=(t "clusterNew.azureaks.dns.placeholder")
type="text"
value=config.masterDnsPrefix
}}
@ -147,40 +147,40 @@
<div class="row">
<div class="col span-6">
<label class="acc-label">{{t 'clusterNew.azureaks.enableHttpApplicationRouting.label'}}</label>
<label class="acc-label">{{t "clusterNew.azureaks.enableHttpApplicationRouting.label"}}</label>
<div class="form-control-static">
<label class="mr-20">
<label class="hand mr-20">
{{radio-button
selection=config.enableHttpApplicationRouting
value=true
}}
{{t 'generic.enabled'}}
{{t "generic.enabled"}}
</label>
<label class="hand">
{{radio-button
selection=config.enableHttpApplicationRouting
value=false
}}
{{t 'generic.disabled'}}
{{t "generic.disabled"}}
</label>
</div>
</div>
<div class="col span-6">
<label class="acc-label">{{t 'clusterNew.azureaks.enableMonitoring.label'}}</label>
<label class="acc-label">{{t "clusterNew.azureaks.enableMonitoring.label"}}</label>
<div class="form-control-static">
<label class="mr-20">
<label class="hand mr-20">
{{radio-button
selection=config.enableMonitoring
value=true
}}
{{t 'generic.enabled'}}
{{t "generic.enabled"}}
</label>
<label class="hand">
{{radio-button
selection=config.enableMonitoring
value=false
}}
{{t 'generic.disabled'}}
{{t "generic.disabled"}}
</label>
</div>
</div>
@ -188,12 +188,11 @@
<div class="row">
<div class="col span-12 mb-0">
<label class="acc-label">{{t 'clusterNew.azureaks.tags.label'}}</label>
<label class="acc-label">{{t "clusterNew.azureaks.tags.label"}}</label>
{{form-key-value
initialMap=tags
changed=(action 'setTags')
addActionLabel="clusterNew.azureaks.tags.addActionLabel"
editing=editing
}}
</div>
</div>
@ -201,8 +200,8 @@
{{/accordion-list-item}}
{{#accordion-list-item
title=(t 'clusterNew.nodes.title')
detail=(t 'clusterNew.nodes.detail')
title=(t "clusterNew.nodes.title")
detail=(t "clusterNew.nodes.detail")
showExpand=false
expandOnInit=true
expandAll=al.expandAll
@ -211,7 +210,7 @@
<div class="row">
<div class="row">
<div class="col span-6">
<label class="acc-label" for="azureaks-admin-username-prefix">{{t 'clusterNew.azureaks.admin.label'}}</label>
<label class="acc-label" for="azureaks-admin-username-prefix">{{t "clusterNew.azureaks.admin.label"}}</label>
{{#input-or-display
editable=isNew
value=config.adminUsername
@ -219,7 +218,7 @@
{{input
classNames="form-control"
id="azureaks-admin-username-prefix"
placeholder=(t 'clusterNew.azureaks.admin.placeholder')
placeholder=(t "clusterNew.azureaks.admin.placeholder")
type="text"
value=config.adminUsername
}}
@ -227,7 +226,7 @@
</div>
<div class="col span-6">
<label class="acc-label" for="azureaks-resource-group">
{{t 'clusterNew.azureaks.resourceGroup.label'}}{{field-required}}
{{t "clusterNew.azureaks.resourceGroup.label"}}{{field-required}}
{{#tooltip-element
type="tooltip-basic"
model=(t "clusterNew.azureaks.resourceGroup.helpText")
@ -246,7 +245,7 @@
{{input
classNames="form-control"
id="azureaks-resource-group"
placeholder=(t 'clusterNew.azureaks.resourceGroup.placeholder')
placeholder=(t "clusterNew.azureaks.resourceGroup.placeholder")
type="text"
value=config.resourceGroup
}}
@ -256,15 +255,16 @@
<div class="row">
<div class="col span-6">
<label class="acc-label" for="azureaks-config-count">{{t 'clusterNew.azureaks.count.label'}}</label>
<label class="acc-label" for="azureaks-config-count">{{t "clusterNew.azureaks.count.label"}}</label>
{{input-number
id="azureaks-config-count"
min=1
value=config.count
placeholder=(t "clusterNew.azureaks.count.placeholder")
}}
</div>
<div class="col span-6">
<label class="acc-label" for="azureaks-os-disk-size">{{t 'clusterNew.azureaks.diskSizeGb.label'}}</label>
<label class="acc-label" for="azureaks-os-disk-size">{{t "clusterNew.azureaks.diskSizeGb.label"}}</label>
{{#input-or-display
editable=isNew
value=config.agentOsdiskSize
@ -274,15 +274,16 @@
id="azureaks-os-disk-size"
min=0
value=config.agentOsdiskSize
placeholder=(t "clusterNew.azureaks.diskSizeGb.placeholder")
}}
<span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span>
<span class="input-group-addon bg-default">{{t "generic.gigabyte"}}</span>
</div>
{{/input-or-display}}
</div>
</div>
<div class="col span-6">
<label class="acc-label" for="azureaks-vm-disk-size">{{t 'clusterNew.azureaks.machineType.label'}}</label>
<label class="acc-label" for="azureaks-vm-disk-size">{{t "clusterNew.azureaks.machineType.label"}}</label>
{{#input-or-display
editable=isNew
value=config.agentVmSize
@ -304,7 +305,7 @@
<div class="col span-12">
{{t "clusterNew.azureaks.networking.label"}}
<div class="radio">
<label class={{concat (if editing 'text-muted') ' acc-label mr-20'}}>
<label class={{concat (if editing "text-muted") " acc-label mr-20"}}>
{{radio-button
selection=netMode
value="default"
@ -312,7 +313,7 @@
}}
{{t "clusterNew.azureaks.networking.default"}}
</label>
<label class={{concat (if editing 'text-muted') ' acc-label'}}>
<label class={{concat (if editing "text-muted") " acc-label"}}>
{{radio-button
selection=netMode
value="advanced"
@ -325,7 +326,7 @@
{{#if (eq netMode "advanced")}}
<div class="row">
<div class="col span-6 mt-0">
<label class="acc-label" for="azureaks-advanced-virtual-network">{{t 'clusterNew.azureaks.networking.vnet.label'}}</label>
<label class="acc-label" for="azureaks-advanced-virtual-network">{{t "clusterNew.azureaks.networking.vnet.label"}}</label>
{{#input-or-display
editable=isNew
value=networkChoice
@ -346,7 +347,7 @@
</div>
<div class="row">
<div class="col span-6 mt-0">
<label class="acc-label" for="azureaks-service-cidr-id">{{t 'clusterNew.azureaks.networking.serviceCidr.label'}}</label>
<label class="acc-label" for="azureaks-service-cidr-id">{{t "clusterNew.azureaks.networking.serviceCidr.label"}}</label>
{{#input-or-display
editable=isNew
value=config.serviceCidr
@ -354,17 +355,17 @@
{{input
classNames="form-control"
id="azureaks-service-cidr-id"
placeholder=(t 'clusterNew.azureaks.networking.serviceCidr.prompt')
placeholder=(t "clusterNew.azureaks.networking.serviceCidr.prompt")
type="text"
value=config.serviceCidr
}}
{{/input-or-display}}
<p class="help-block">
{{t 'clusterNew.azureaks.networking.serviceCidr.help'}}
{{t "clusterNew.azureaks.networking.serviceCidr.help"}}
</p>
</div>
<div class="col span-6 mt-0">
<label class="acc-label" for="azureaks-dns-service-ip">{{t 'clusterNew.azureaks.networking.dnsServiceIp.label'}}</label>
<label class="acc-label" for="azureaks-dns-service-ip">{{t "clusterNew.azureaks.networking.dnsServiceIp.label"}}</label>
{{#input-or-display
editable=isNew
value=config.dnsServiceIp
@ -374,16 +375,17 @@
id="azureaks-dns-service-ip"
type="text"
value=config.dnsServiceIp
placeholder=(t "clusterNew.azureaks.networking.dnsServiceIp.placeholder")
}}
{{/input-or-display}}
<p class="help-block">
{{t 'clusterNew.azureaks.networking.dnsServiceIp.help'}}
{{t "clusterNew.azureaks.networking.dnsServiceIp.help"}}
</p>
</div>
</div>
<div class="row">
<div class="col span-6 mt-0">
<label class="acc-label" for="azureaks-docker-service-ip">{{t 'clusterNew.azureaks.networking.dockerBridgeCidr.label'}}</label>
<label class="acc-label" for="azureaks-docker-service-ip">{{t "clusterNew.azureaks.networking.dockerBridgeCidr.label"}}</label>
{{#input-or-display
editable=isNew
value=config.dockerBridgeCidr
@ -393,14 +395,15 @@
id="azureaks-docker-service-ip"
type="text"
value=config.dockerBridgeCidr
placeholder=(t "clusterNew.azureaks.networking.dockerBridgeCidr.placeholder")
}}
{{/input-or-display}}
<p class="help-block">
{{t 'clusterNew.azureaks.networking.dockerBridgeCidr.help'}}
{{t "clusterNew.azureaks.networking.dockerBridgeCidr.help"}}
</p>
</div>
<div class="col span-6 mt-0">
<label class="acc-label">{{t 'clusterNew.azureaks.networkPolicy.label'}}</label>
<label class="acc-label">{{t "clusterNew.azureaks.networkPolicy.label"}}</label>
{{#input-or-display
editable=isNew
value=config.networkPolicy
@ -409,6 +412,7 @@
class="form-control"
content=networkPolicyContent
value=config.networkPolicy
placeholder=(t "clusterNew.azureaks.networkPolicy.placeholder")
}}
{{/input-or-display}}
</div>
@ -418,16 +422,21 @@
<div class="row">
<div class="col span-12">
<label class="acc-label" for="azureaks-advanced-ssh-pub-key">{{t 'clusterNew.azureaks.ssh.label'}}{{field-required}}</label>
<label class="acc-label" for="azureaks-advanced-ssh-pub-key">{{t "clusterNew.azureaks.ssh.label"}}{{field-required}}</label>
{{#input-or-display
editable=isEditable
value=config.sshPublicKeyContents
}}
{{textarea
{{input-text-file
id="azureaks-advanced-ssh-pub-key"
classNames="box"
value=config.sshPublicKeyContents
classNames="form-control no-resize"
rows="3"
multiple=true
canChangeName=false
accept="application/x-x509-ca-cert,text/plain,.pem,.crt,.pub"
minHeight=60
placeholder="newCertificate.cert.placeholder"
shouldChangeName=false
}}
{{/input-or-display}}
</div>

View File

@ -2135,6 +2135,7 @@ clusterNew:
label: Placement
count:
label: Node Count
placeholder: e.g. 1
location:
label: Location
prompt: Choose a location...
@ -2148,6 +2149,7 @@ clusterNew:
prompt: Choose a size...
diskSizeGb:
label: OS Disk Size
placeholder: e.g. 100
dns:
label: DNS Prefix
placeholder: "e.g. example"
@ -2205,9 +2207,11 @@ clusterNew:
dnsServiceIp:
label: Kubernetes DNS service IP address
help: "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range. For example: 10.0.0.10."
placeholder: e.g. 10.0.0.10
dockerBridgeCidr:
label: Docker bridge address
help: 'An IP address and netmask assigned to Docker Bridge. It must not be in any Subnet IP ranges, or the Kubernetes service address range. For example: 172.17.0.1/16.'
placeholder: e.g. 172.17.0.1/16
sshUser:
label: SSH User
placeholder: usr1
@ -2245,39 +2249,16 @@ clusterNew:
placeholder: Your Client Secret
region:
label: Region
aadClientAppId:
label: Client ID
placeholder: Your Client ID of Azure Active Directory.
aadTenantId:
label: Tenant ID
placeholder: Your Tenant ID of Azure Active Directory.
aadServerAppId:
label: Server ID
placeholder: Your Server ID of Azure Active Directory.
aadServerAppSecret:
label: Server Secret
placeholder: Your Server Secret of Azure Active Directory.
enableHttpApplicationRouting:
label: HTTP Application Routing
enableMonitoring:
label: Monitoring
logAnalyticsWorkspaceResourceGroup:
label: Region
placeholder: Log Analytics Workspace Region.
logAnalyticsWorkspace:
label: Log Analytics Workspace
placeholder: Log Analytics Workspace.
agentOsdiskSize:
label: OS Disk Size
networkPolicy:
label: Network Policy
placeholder: Select a Network Policy
tags:
label: Tags
addActionLabel: Add Tag
header:
azureAD: Azure Active Directory
network: Network
monitoring: Monitoring
errors:
included:
serviceCidr: 'Kubernetes service address range must be valid CIDR format.'
@ -5004,6 +4985,11 @@ newCertificate:
metaXML:
label: Metadata XML
placeholder: "Paste in the IDP Metadata XML"
publicKey:
label: SSH Public Key
required: Public Key is required.
invalidFormat: Public Key is invalid.
placeholder: "Paste in the public key, typically starting with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"
errors:
encrypted: The private key cannot be password-protected.
key:

View File

@ -2057,6 +2057,7 @@ clusterNew:
label: 位置
count:
label: 主机数量
placeholder: "例如: 1"
location:
label: 位置
prompt: 选择一个位置...
@ -2070,6 +2071,7 @@ clusterNew:
prompt: 选择一个规格...
diskSizeGb:
label: OS磁盘大小
placeholder: "例如: 100"
dns:
label: DNS前缀
placeholder: "例如: example"
@ -2127,9 +2129,11 @@ clusterNew:
dnsServiceIp:
label: Kubernetes DNS服务IP地址
help: "分配给Kubernetes DNS服务的IP地址它必须在Kubernetes服务地址范围内。例如: 10.0.0.10."
placeholder: "例如: 10.0.0.10"
dockerBridgeCidr:
label: Docker bridge地址
help: '分配给Docker Bridge的IP地址和网络掩码它不能位于任何子网IP范围或Kubernetes服务地址范围内。例如: 172.17.0.1/16.'
placeholder: "例如: 172.17.0.1/16"
sshUser:
label: SSH用户
placeholder: usr1
@ -2167,39 +2171,16 @@ clusterNew:
placeholder: 客户端秘钥
region:
label: 区域
aadClientAppId:
label: Client ID
placeholder: Your Client ID of Azure Active Directory.
aadTenantId:
label: Tenant ID
placeholder: Your Tenant ID of Azure Active Directory.
aadServerAppId:
label: Server ID
placeholder: Your Server ID of Azure Active Directory.
aadServerAppSecret:
label: Server Secret
placeholder: Your Server Secret of Azure Active Directory.
enableHttpApplicationRouting:
label: HTTP应用程序路由
enableMonitoring:
label: 监控
logAnalyticsWorkspaceResourceGroup:
label: 地区
placeholder: Log Analytics Workspace Region.
logAnalyticsWorkspace:
label: Log Analytics Workspace
placeholder: Log Analytics Workspace.
agentOsdiskSize:
label: 系统盘大小
networkPolicy:
label: 网络策略
placeholder: 选择网络策略
tags:
label: 标签
addActionLabel: 添加标签
header:
azureAD: Azure Active Directory
network: 网络
monitoring: 监控
errors:
included:
serviceCidr: 'Kubernetes服务地址范围必须是有效的CIDR格式。'
@ -4875,6 +4856,11 @@ newCertificate:
metaXML:
label: 元数据XML
placeholder: "粘贴IDP Metadata XML"
publicKey:
label: SSH公钥
required: 必须填写公钥
invalidFormat: 公钥无效
placeholder: "粘贴或导入证书,以'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'开头"
errors:
encrypted: 私钥不能被密码保护
key: