Merge pull request #4603 from westlywright/bug.imported.release.channels

GKE V2 Updates

app/models/cluster.js

@@ -121,6 +121,7 @@ export const DEFAULT_GKE_CONFIG = {
     useIpAliases:               true
   },
   kubernetesVersion:        '',
+  labels:                   {},
   locations:                null,
   loggingService:           'logging.googleapis.com/kubernetes',
   maintenanceWindow:        null,

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

@@ -194,7 +194,7 @@ export default Component.extend(ClusterDriver, {
         this.google.fetchServiceAccounts(config, this.saved),
       ];
 
-      if (this.editing && config.imported) {
+      if (this.editing) {
         promises.push(this.google.fetchClusters(config, this.saved));
       }
 

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

@@ -190,7 +190,10 @@
             />
             <p class="help-block">
               {{#if clusterReleaseChannel}}
-                {{t "clusterNew.googlegke.masterVersion.channel" channel=clusterReleaseChannel}}
+                {{t
+                  "clusterNew.googlegke.masterVersion.channel"
+                  channel=clusterReleaseChannel
+                }}
               {{else}}
                 {{t "clusterNew.googlegke.masterVersion.staticRelease"}}
               {{/if}}
@@ -556,12 +559,26 @@
                     @value={{mut config.description}}
                     @classNames="form-control no-resize description"
                     @rows={{"1"}}
-                    @placeholder={{"formNameDescription.description.placeholder"}}
+                    @placeholder={{"formNameDescription.description.placeholder"
+                    }}
                   />
                 </InputOrDisplay>
               </div>
             </div>
           </div>
+          <div class="row">
+            <div class="col span-6">
+              <label class="acc-label">
+                {{t "clusterNew.googlegke.clusterLabels.label"}}
+              </label>
+              <FormKeyValue
+                @initialMap={{config.labels}}
+                @changed={{fn (mut config.labels)}}
+                @addActionLabel="clusterNew.googlegke.clusterLabels.addAction"
+                @editing={{isNewOrEditable}}
+              />
+            </div>
+          </div>
         </section>
       </AccordionListItem>
       <AccordionListItem

translations/en-us.yaml

@@ -3698,6 +3698,7 @@ clusterNew:
       label: Container Address Range
       placeholder: e.g. 10.42.0.0/16
     clusterLabels:
+      addAction: Add Label
       label: Cluster Labels
     clusterLocation:
       createLabel: Configure Cluster
@@ -3852,10 +3853,10 @@ clusterNew:
       label: Master IPV4 CIDR Block
       placeholder: e.g. 10.42.0.0/28
     masterVersion:
+      channel: '{channel} channel'
       label: Kubernetes Version
-      channel: "{channel} channel"
-      staticRelease: Static version
       prompt: Choose a Version...
+      staticRelease: Static version
       warning: When you upgrade the Kubernetes version with GKE only the master version will be upgraded. If you would like to upgrade the nodes as well you will need to do this manually via the Google Cloud Platform.
     maxNodeCount:
       label: Maximum Node Count