From 7b3531c41a73e0cc9ed0676908179e9a0cc0b96d Mon Sep 17 00:00:00 2001 From: Phillip Rak Date: Thu, 23 Sep 2021 14:38:15 -0700 Subject: [PATCH 1/2] Update initial version to a value in our list of versions --- .../addon/components/cluster-driver/driver-aks/component.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-aks/component.js b/lib/shared/addon/components/cluster-driver/driver-aks/component.js index ca07868a3..1683c3cc7 100644 --- a/lib/shared/addon/components/cluster-driver/driver-aks/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-aks/component.js @@ -270,8 +270,9 @@ export default Component.extend(ClusterDriver, { const isEdit = mode === 'edit'; const versionz = (get(versions, 'body') || []); + const defaultVersion = versionz[versionz.length - 1] || ''; const upgradeVersionz = (get(upgradeVersions, 'body.upgrades') || []); - const initialVersion = isEdit ? this.config.kubernetesVersion : '1.19.9'; // default in azure ui //Semver.maxSatisfying(versionz, this.defaultK8sVersionRange); + const initialVersion = isEdit ? this.config.kubernetesVersion : defaultVersion; // default in azure ui //Semver.maxSatisfying(versionz, this.defaultK8sVersionRange); if (!isEdit && initialVersion) { set(this, 'cluster.aksConfig.kubernetesVersion', initialVersion); From 3ea2a79332ff4cff2cd873b4c76bd3979930fadd Mon Sep 17 00:00:00 2001 From: Phillip Rak Date: Thu, 23 Sep 2021 16:09:20 -0700 Subject: [PATCH 2/2] Make use of Semver to get default kubernetes version for azure --- .../addon/components/cluster-driver/driver-aks/component.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-aks/component.js b/lib/shared/addon/components/cluster-driver/driver-aks/component.js index 1683c3cc7..2f0513933 100644 --- a/lib/shared/addon/components/cluster-driver/driver-aks/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-aks/component.js @@ -9,7 +9,7 @@ import { inject as service } from '@ember/service'; import { isEmpty } from '@ember/utils'; import ipaddr from 'ipaddr.js'; import { hash } from 'rsvp'; -// import Semver from 'semver'; +import Semver from 'semver'; import ClusterDriver from 'shared/mixins/cluster-driver'; import C from 'shared/utils/constants'; import { addQueryParams } from 'shared/utils/util'; @@ -270,9 +270,8 @@ export default Component.extend(ClusterDriver, { const isEdit = mode === 'edit'; const versionz = (get(versions, 'body') || []); - const defaultVersion = versionz[versionz.length - 1] || ''; const upgradeVersionz = (get(upgradeVersions, 'body.upgrades') || []); - const initialVersion = isEdit ? this.config.kubernetesVersion : defaultVersion; // default in azure ui //Semver.maxSatisfying(versionz, this.defaultK8sVersionRange); + const initialVersion = isEdit ? this.config.kubernetesVersion : Semver.maxSatisfying(versionz, this.defaultK8sVersionRange); // default in azure ui if (!isEdit && initialVersion) { set(this, 'cluster.aksConfig.kubernetesVersion', initialVersion);