Merge pull request #4249 from jlamillan/jlamillan/oke_flex_boot

Add support for custom boot volume size and setting oCPUs for flexibl…

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) => {

lib/shared/addon/components/cluster-driver/driver-oracleoke/template.hbs

@@ -352,7 +352,7 @@
 
           <div class="row">
 
-            <div class="col span-6">
+            <div class="col span-4">
               <label class="acc-label">
                 {{t 'clusterNew.oracleoke.nodeShape.label'}}{{field-required}}
               </label>
@@ -366,10 +366,26 @@
                 <div>{{config.nodeShape}}</div>
               {{/if}}
             </div>
+            {{#if (eq config.nodeShape "VM.Standard.E3.Flex")}}
+              <div class="col span-4">
+                <label class="acc-label" for="input-ocpu-count">
+                  {{t "clusterNew.oracleoke.flexShapeConfig.label"}}
+                </label>{{field-required}}
+                {{input-number
+                  id="input-ocpu-count"
+                  min=1
+                  max=64
+                  value=config.flexOcpus
+                }}
+              </div>
+            {{/if}}
+          </div>
 
-            <div class="col span-6">
+          <div class="row">
+
+            <div class="col span-4">
               <label class="acc-label">
-                {{t 'clusterNew.oracleoke.os.label'}}
+                {{t 'clusterNew.oracleoke.os.label'}}{{field-required}}
               </label>
               {{#if (eq step 4)}}
                 <select class="form-control" onchange={{action (mut config.nodeImage) value="target.value"}}>
@@ -379,10 +395,19 @@
                   {{/each}}
                 </select>
               {{else}}
-                <div>{{ config.nodeImage}}</div>
+                <div>{{config.nodeImage}}</div>
               {{/if}}
             </div>
 
+            <div class="col span-4">
+              <label class="acc-label">
+                {{t "clusterNew.oracleoke.bootVolumeSize.label"}}
+              </label>
+              <div class="input-group">
+                {{input-number min=50 max=32768 value=config.customBootVolumeSize }}
+                <span class="input-group-addon bg-default">{{t "generic.gigabyte"}}</span>
+              </div>
+            </div>
           </div>
 
           <div class="row">

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: