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 @@
-
+
@@ -366,10 +366,26 @@
{{config.nodeShape}}
{{/if}}
+ {{#if (eq config.nodeShape "VM.Standard.E3.Flex")}} +
+ {{field-required}} + {{input-number + id="input-ocpu-count" + min=1 + max=64 + value=config.flexOcpus + }} +
+ {{/if}} +
-
+
+ +
{{#if (eq step 4)}} {{else}} -
{{ config.nodeImage}}
+
{{config.nodeImage}}
{{/if}}
+
+ +
+ {{input-number min=50 max=32768 value=config.customBootVolumeSize }} + {{t "generic.gigabyte"}} +
+
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 89d8f8444..27e581dbb 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -4191,8 +4191,11 @@ clusterNew: label: Operating System storageType: label: Default Persistent Volume Disk Type - storageSize: - label: Default Persistent Volume Disk Size + bootVolumeSize: + label: Optionally override default boot volume size for nodes + error: Custom boot volume disk size should be greater than the default (46.6 GB) + flexShapeConfig: + label: Specify the number of OCPUs for the flex shape placeholder: e.g. 10 error: Default Persistent Volume Disk Size should be greater than 0 localDisk: