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

Merge pull request #3728 from westlywright/aks.version.default 

Azure aks get the latest satisfying version from versions
This commit is contained in:
Westly Wright 2020-01-24 16:55:29 -07:00 committed by GitHub
parent 6cf81ba389 19434d8b2e
commit a7ea42c89a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/shared/addon/components/cluster-driver/driver-azureaks/component.js
View File

@ -3,12 +3,15 @@ import Component from '@ember/component'
import { import {
computed, get, set, setProperties, observer computed, get, set, setProperties, observer
} from '@ember/object'; } from '@ember/object';
import { alias } from '@ember/object/computed';
import layout from './template'; import layout from './template';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
import { hash } from 'rsvp'; import { hash } from 'rsvp';
import { on } from '@ember/object/evented'; import { on } from '@ember/object/evented';
import ipaddr from 'ipaddr.js'; import ipaddr from 'ipaddr.js';
import { equal } from '@ember/object/computed' import { equal } from '@ember/object/computed'
import C from 'shared/utils/constants';
import Semver from 'semver';
import { import {
sizes, sizes,
@ -32,6 +35,7 @@ const NETWORK_PLUGINS = [
export default Component.extend(ClusterDriver, { export default Component.extend(ClusterDriver, {
globalStore: service(), globalStore: service(),
intl: service(), intl: service(),
settings: service(),
layout, layout,
configField: 'azureKubernetesServiceConfig', configField: 'azureKubernetesServiceConfig',
@ -42,6 +46,7 @@ export default Component.extend(ClusterDriver, {
netMode: 'default', netMode: 'default',
monitoringRegionConent: [], monitoringRegionConent: [],
networkPlugins: NETWORK_PLUGINS, networkPlugins: NETWORK_PLUGINS,
defaultK8sVersionRange: alias(`settings.${ C.SETTING.VERSION_SYSTEM_K8S_DEFAULT_RANGE }`),
editing: equal('mode', 'edit'), editing: equal('mode', 'edit'),
isNew: equal('mode', 'new'), isNew: equal('mode', 'new'),
@ -115,6 +120,12 @@ export default Component.extend(ClusterDriver, {
return hash(aksRequest).then((resp) => { return hash(aksRequest).then((resp) => {
const { versions, virtualNetworks } = resp; const { versions, virtualNetworks } = resp;
const versionz = (get(versions, 'body') || []);
const initialVersion = Semver.maxSatisfying(versionz, this.defaultK8sVersionRange);
if (initialVersion) {
set(this, 'cluster.azureKubernetesServiceConfig.kubernetesVersion', initialVersion);
}
setProperties(this, { setProperties(this, {
step: 2, step: 2,