mirror of https://github.com/rancher/ui.git
Merge pull request #4765 from rak-phillip/bugfix/4262-kubernetes-version
[master] Update initial kubernetes version for AKS
This commit is contained in:
commit
f736c9833e
|
|
@ -9,7 +9,7 @@ import { inject as service } from '@ember/service';
|
||||||
import { isEmpty } from '@ember/utils';
|
import { isEmpty } from '@ember/utils';
|
||||||
import ipaddr from 'ipaddr.js';
|
import ipaddr from 'ipaddr.js';
|
||||||
import { hash } from 'rsvp';
|
import { hash } from 'rsvp';
|
||||||
// import Semver from 'semver';
|
import Semver from 'semver';
|
||||||
import ClusterDriver from 'shared/mixins/cluster-driver';
|
import ClusterDriver from 'shared/mixins/cluster-driver';
|
||||||
import C from 'shared/utils/constants';
|
import C from 'shared/utils/constants';
|
||||||
import { addQueryParams } from 'shared/utils/util';
|
import { addQueryParams } from 'shared/utils/util';
|
||||||
|
|
@ -271,7 +271,7 @@ export default Component.extend(ClusterDriver, {
|
||||||
const isEdit = mode === 'edit';
|
const isEdit = mode === 'edit';
|
||||||
const versionz = (get(versions, 'body') || []);
|
const versionz = (get(versions, 'body') || []);
|
||||||
const upgradeVersionz = (get(upgradeVersions, 'body.upgrades') || []);
|
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 : Semver.maxSatisfying(versionz, this.defaultK8sVersionRange); // default in azure ui
|
||||||
|
|
||||||
if (!isEdit && initialVersion) {
|
if (!isEdit && initialVersion) {
|
||||||
set(this, 'cluster.aksConfig.kubernetesVersion', initialVersion);
|
set(this, 'cluster.aksConfig.kubernetesVersion', initialVersion);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue