Enable external server by default for Huawei hosted k8s

lib/shared/addon/components/cluster-driver/driver-huaweicce/component.js

@@ -180,7 +180,7 @@ export default Component.extend(ClusterDriver, {
         rootVolumeType:        'SATA',
         nodeCount:             1,
         rootVolumeSize:        40,
-        externalServerEnabled: false,
+        externalServerEnabled: true,
         nodeOperationSystem:   'EulerOS 2.2',
         containerNetworkCidr:  '172.16.0.0/16',
         bmsIsAutoRenew:        'false',
@@ -523,12 +523,7 @@ export default Component.extend(ClusterDriver, {
   externalServerChange: observer('config.externalServerEnabled', function() {
     const externalServerEnabled = get(this, 'config.externalServerEnabled')
 
-    if (externalServerEnabled) {
-      const eipIds = get(this, 'eipIds') || []
-      const defaultId = eipIds[0] && eipIds[0].id
-
-      set(this, 'config.clusterEipId', defaultId)
-    } else {
+    if ( !externalServerEnabled ) {
       set(this, 'config.clusterEipId', null)
     }
   }),

lib/shared/addon/components/cluster-driver/driver-huaweicce/template.hbs

@@ -278,16 +278,14 @@
           {{else}}
             <div class="radio">
               <label>
-                {{radio-button selection=config.externalServerEnabled value=false}}
-                {{t 'generic.disabled'}}
+                {{radio-button selection=config.externalServerEnabled value=true}}
+                {{t 'generic.enabled'}}
               </label>
             </div>
             <div class="radio">
-              <label class={{unless (gt eipIdContent.length 0) 'text-muted'}}>
-                {{radio-button selection=config.externalServerEnabled value=true disabled=(not (gt eipIdContent.length 0))}}
-                {{t 'generic.enabled'}}
-                {{#unless (gt eipIdContent.length 0)}} &mdash; {{t 'clusterNew.huaweicce.eipIds.none'}}
-                {{/unless}}
+              <label>
+                {{radio-button selection=config.externalServerEnabled value=false}}
+                {{t 'generic.disabled'}}
               </label>
             </div>
           {{/if}}
@@ -298,9 +296,11 @@
             {{#if editing}}
               <div>{{clusterEipName}}</div>
             {{else}}
-              {{new-select classNames="form-control"
-              value=config.clusterEipId
-              content=eipIdContent
+              {{new-select
+                  classNames="form-control"
+                  prompt=(t 'clusterNew.huaweicce.clusterEipId.prompt')
+                  value=config.clusterEipId
+                  content=eipIdContent
             }}
             {{/if}}
           </div>

translations/en-us.yaml

@@ -847,7 +847,7 @@ metricsAction:
     workload: Workload Metrics
     pod: Pod Metrics
     container: Container Metrics
-  grafana: 
+  grafana:
     label: Grafana
   summary:
     label: Summary
@@ -2372,6 +2372,7 @@ clusterNew:
       label: Node Label
     clusterEipId:
       label: Cluster Eip
+      prompt: Choose a Eip...
     externalServerEnabled:
       label: External Server
       enabled: Enabled
@@ -4100,13 +4101,13 @@ formNetwork:
 formCustomMetrics:
   title: Custom Metrics
   detail: Expose the endpoints for Prometheus to collect custom metrics
-  port: 
+  port:
     label: Container Port
     placeholder: e.g. 8080
-  path: 
+  path:
     label: Path
     placeholder: e.g. /metrics
-  protocol: 
+  protocol:
     label: Protocol
   noPorts: No Endpoints
   addActionLabel: Add Metrics Endpoint
@@ -6182,7 +6183,7 @@ volumesPage:
   storageClass:
     label: Storage Class
 
-    
+
 vmConsole:
   header: "Console:"
   protip: "ProTip: Hold the {key} key when opening shell access to launch a new window."

translations/zh-hans.yaml

@@ -2359,6 +2359,7 @@ clusterNew:
     shortLabel: Huawei CCE
     clusterEipId:
       label: Cluster Eip
+      prompt: 选择Eip...
     externalServerEnabled:
       label: 外部服务器
       enabled: Enabled
@@ -4084,13 +4085,13 @@ formNetwork:
 formCustomMetrics:
   title: 自定义指标
   detail: 配置自定义指标端口，监控系统将通过这些端口采集自定义指标。
-  port: 
+  port:
     label: 容器端口
     placeholder: 例如：8080
-  path: 
+  path:
     label: Path
     placeholder: 例如：/metrics
-  protocol: 
+  protocol:
     label: 协议
   noPorts: 没有自定义指标
   addActionLabel: 添加自定义指标