From 2a7a8c69a52150bdcc183d585b81774f0f621117 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Fri, 30 Apr 2021 10:24:20 -0700
Subject: [PATCH 1/2] Release channels can be changed on the gke side during
 edit

so we need to fire the gkeClusters call and logic for finding the channel on every gke cluster edit

rancher/rancher#32360
---
 .../addon/components/cluster-driver/driver-gke/component.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/shared/addon/components/cluster-driver/driver-gke/component.js b/lib/shared/addon/components/cluster-driver/driver-gke/component.js
index 56ac9397e..19a87aa42 100644
--- a/lib/shared/addon/components/cluster-driver/driver-gke/component.js
+++ b/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));
       }
 

From ff34d90fb878cd51ea44d1136f08c26129cbed51 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Fri, 30 Apr 2021 10:43:30 -0700
Subject: [PATCH 2/2] Expose cluster labels on gke v2 create

rancher/rancher#32433
---
 app/models/cluster.js                         |  1 +
 .../cluster-driver/driver-gke/template.hbs    | 21 +++++++++++++++++--
 translations/en-us.yaml                       |  5 +++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/models/cluster.js b/app/models/cluster.js
index 726d196c0..91df4efb8 100644
--- a/app/models/cluster.js
+++ b/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,
diff --git a/lib/shared/addon/components/cluster-driver/driver-gke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-gke/template.hbs
index 5da4e56d3..0b99c8d96 100644
--- a/lib/shared/addon/components/cluster-driver/driver-gke/template.hbs
+++ b/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
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 2ed4f18a2..31b39e7a8 100644
--- a/translations/en-us.yaml
+++ b/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