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

Merge pull request #4535 from westlywright/bugs.gke 

fix missing node version on a new node pool for gke
This commit is contained in:
Westly Wright 2021-04-13 16:03:11 -07:00 committed by GitHub
parent 88d13bd424 2145a8e743
commit 827e181f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/shared/addon/components/gke-node-pool-row/component.js
View File

@ -68,6 +68,10 @@ export default Component.extend({
set(this, 'scopeConfig', scopeConfig); set(this, 'scopeConfig', scopeConfig);
} }
} }
if (isEmpty(this?.model?.version) && !isEmpty(this?.cluster?.gkeConfig?.kubernetesVersion)) {
set(this, 'model.version', this?.cluster?.gkeConfig?.kubernetesVersion);
}
} else { } else {
setProperties(this, { setProperties(this, {
oauthScopesSelection: this.google.oauthScopeOptions.DEFAULT, oauthScopesSelection: this.google.oauthScopeOptions.DEFAULT,
@ -157,6 +161,10 @@ export default Component.extend({
const clusterVersion = get(this, 'controlPlaneVersion'); const clusterVersion = get(this, 'controlPlaneVersion');
const nodeVersion = get(this, 'model.version'); const nodeVersion = get(this, 'model.version');
if (isEmpty(clusterVersion) || isEmpty(nodeVersion)) {
return false;
}
const initalClusterMinorVersion = parseInt(minor(coerce(clusterVersion)), 10); const initalClusterMinorVersion = parseInt(minor(coerce(clusterVersion)), 10);
const initalNodeMinorVersion = parseInt(minor(coerce(nodeVersion)), 10); const initalNodeMinorVersion = parseInt(minor(coerce(nodeVersion)), 10);
const diff = initalClusterMinorVersion - initalNodeMinorVersion; const diff = initalClusterMinorVersion - initalNodeMinorVersion;