diff --git a/lib/shared/addon/components/cluster-driver/driver-oracleoke/component.js b/lib/shared/addon/components/cluster-driver/driver-oracleoke/component.js index 02eedd149..6a5b858cd 100644 --- a/lib/shared/addon/components/cluster-driver/driver-oracleoke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-oracleoke/component.js @@ -6,7 +6,7 @@ import { get, set, computed, setProperties } from '@ember/object'; import { inject as service } from '@ember/service'; import { hash } from 'rsvp'; import { OCI_REGIONS } from 'shared/utils/oci'; - +import { compare } from 'shared/utils/parse-version'; const vcnIdMap = { quick: 'Quick Create', } @@ -52,7 +52,7 @@ export default Component.extend(ClusterDriver, { vcn: '', securityListId: '', subnetAccess: 'public', - cpu: 0, + flexOcpus: 0, memory: 0, quantityPerSubnet: 1, quantityOfNodeSubnets: 1, @@ -99,10 +99,13 @@ export default Component.extend(ClusterDriver, { const { okeVersions } = resp; setProperties(this, { - okeVersions: (get( okeVersions, 'body') || []), + okeVersions: (get( okeVersions, 'body') || []).sort((a, b) => compare(a, b) < 0), // latest version first errors: [], }); + // latest version by default + set(this, 'config.kubernetesVersion', (get(this, 'okeVersions')[0] || null)) + set(this, 'step', 2); cb(true); }).catch((xhr) => { diff --git a/lib/shared/addon/components/cluster-driver/driver-oracleoke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-oracleoke/template.hbs index 32732266e..ca64b01af 100644 --- a/lib/shared/addon/components/cluster-driver/driver-oracleoke/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-oracleoke/template.hbs @@ -352,7 +352,7 @@