rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

GKE V2 Updates
This commit is contained in:
Westly Wright 2021-04-30 11:13:20 -07:00 committed by GitHub
parent 2a866b5fb0 ff34d90fb8
commit 26683cc127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/cluster.js
View File

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

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

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

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

@ -190,7 +190,10 @@
/> />
<p class="help-block"> <p class="help-block">
{{#if clusterReleaseChannel}} {{#if clusterReleaseChannel}}
{{t "clusterNew.googlegke.masterVersion.channel" channel=clusterReleaseChannel}} {{t
"clusterNew.googlegke.masterVersion.channel"
channel=clusterReleaseChannel
}}
{{else}} {{else}}
{{t "clusterNew.googlegke.masterVersion.staticRelease"}} {{t "clusterNew.googlegke.masterVersion.staticRelease"}}
{{/if}} {{/if}}
@ -556,12 +559,26 @@
@value={{mut config.description}} @value={{mut config.description}}
@classNames="form-control no-resize description" @classNames="form-control no-resize description"
@rows={{"1"}} @rows={{"1"}}
@placeholder={{"formNameDescription.description.placeholder"}} @placeholder={{"formNameDescription.description.placeholder"
}}
/> />
</InputOrDisplay> </InputOrDisplay>
</div> </div>
</div> </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> </section>
</AccordionListItem> </AccordionListItem>
<AccordionListItem <AccordionListItem

5
translations/en-us.yaml
View File

@ -3698,6 +3698,7 @@ clusterNew:
label: Container Address Range label: Container Address Range
placeholder: e.g. 10.42.0.0/16 placeholder: e.g. 10.42.0.0/16
clusterLabels: clusterLabels:
addAction: Add Label
label: Cluster Labels label: Cluster Labels
clusterLocation: clusterLocation:
createLabel: Configure Cluster createLabel: Configure Cluster
@ -3852,10 +3853,10 @@ clusterNew:
label: Master IPV4 CIDR Block label: Master IPV4 CIDR Block
placeholder: e.g. 10.42.0.0/28 placeholder: e.g. 10.42.0.0/28
masterVersion: masterVersion:
channel: '{channel} channel'
label: Kubernetes Version label: Kubernetes Version
channel: "{channel} channel"
staticRelease: Static version
prompt: Choose a 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. 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: maxNodeCount:
label: Maximum Node Count label: Maximum Node Count