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/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)); } 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 @@ />

{{#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" + }} /> +

+
+ + +
+