complete stack all flex instance shape support

Signed-off-by: junior <[email protected]>

Author: junior

deploy/complete/terraform/oke-variables.tf

@@ -106,17 +106,26 @@ variable "num_pool_workers" {
   default     = 3
   description = "The number of worker nodes in the node pool. If select Cluster Autoscaler, will assume the minimum number of nodes configured"
 }
-variable "node_pool_shape" {
-  default     = "VM.Standard.E3.Flex"
-  description = "A shape is a template that determines the number of OCPUs, amount of memory, and other resources allocated to a newly created instance for the Worker Node"
-}
-variable "node_pool_node_shape_config_ocpus" {
-  default     = "1" # Only used if flex shape is selected
-  description = "You can customize the number of OCPUs to a flexible shape"
-}
-variable "node_pool_node_shape_config_memory_in_gbs" {
-  default     = "16" # Only used if flex shape is selected
-  description = "You can customize the amount of memory allocated to a flexible shape"
+# variable "node_pool_shape" {
+#   default     = "VM.Standard.E3.Flex"
+#   description = "A shape is a template that determines the number of OCPUs, amount of memory, and other resources allocated to a newly created instance for the Worker Node"
+# }
+# variable "node_pool_node_shape_config_ocpus" {
+#   default     = "1" # Only used if flex shape is selected
+#   description = "You can customize the number of OCPUs to a flexible shape"
+# }
+# variable "node_pool_node_shape_config_memory_in_gbs" {
+#   default     = "16" # Only used if flex shape is selected
+#   description = "You can customize the amount of memory allocated to a flexible shape"
+# }
+variable "node_pool_instance_shape" {
+  type = map(any)
+  default = {
+    "instanceShape" = "VM.Standard.E4.Flex"
+    "ocpus"         = 2
+    "memory"        = 16
+  }
+  description = "A shape is a template that determines the number of OCPUs, amount of memory, and other resources allocated to a newly created instance for the Worker Node. Select at least 2 OCPUs and 16GB of memory if using Flex shapes"
 }
 variable "node_pool_boot_volume_size_in_gbs" {
   default     = "60"

deploy/complete/terraform/oke.tf

@@ -43,7 +43,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
   compartment_id     = local.oke_compartment_ocid
   kubernetes_version = (var.k8s_version == "Latest") ? local.node_pool_k8s_latest_version : var.k8s_version
   name               = var.node_pool_name
-  node_shape         = var.node_pool_shape
+  node_shape         = var.node_pool_instance_shape.instanceShape
   ssh_public_key     = var.generate_public_ssh_key ? tls_private_key.oke_worker_node_ssh_key.public_key_openssh : var.public_ssh_key
 
   node_config_details {
@@ -61,8 +61,8 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
   dynamic "node_shape_config" {
     for_each = local.is_flexible_node_shape ? [1] : []
     content {
-      ocpus         = var.node_pool_node_shape_config_ocpus
-      memory_in_gbs = var.node_pool_node_shape_config_memory_in_gbs
+      ocpus         = var.node_pool_instance_shape.ocpus
+      memory_in_gbs = var.node_pool_instance_shape.memory
     }
   }
 
@@ -114,5 +114,6 @@ locals {
 
 # Checks if is using Flexible Compute Shapes
 locals {
-  is_flexible_node_shape = contains(local.compute_flexible_shapes, var.node_pool_shape)
+  # Checks if is using Flexible Compute Shapes
+  is_flexible_node_shape = contains(split(".", var.node_pool_instance_shape.instanceShape), "Flex")
 }

deploy/complete/terraform/schema.yaml

@@ -49,9 +49,7 @@ variableGroups:
     - cluster_autoscaler_min_nodes
     - cluster_autoscaler_max_nodes
     - existent_oke_nodepool_id_for_autoscaler
-    - node_pool_shape
-    - node_pool_node_shape_config_ocpus
-    - node_pool_node_shape_config_memory_in_gbs
+    - node_pool_instance_shape
     - generate_public_ssh_key
     - public_ssh_key
     - image_operating_system
@@ -270,7 +268,7 @@ variables:
 
   cluster_autoscaler_enabled:
     type: boolean
-    title: "Enable Cluster Autoscaler"    
+    title: "Enable Cluster Autoscaler"
 
   num_pool_workers:
     type: integer
@@ -316,8 +314,8 @@ variables:
         - not:
           - create_new_oke_cluster
 
-  node_pool_shape:
-    type: oci:core:instanceshape:name
+  node_pool_instance_shape:
+    type: oci:core:instanceshapewithflex:name
     title: "Select a shape for the Worker Nodes instances"
     required: true
     dependsOn:
@@ -326,46 +324,6 @@ variables:
       and:
         - create_new_oke_cluster
 
-  node_pool_node_shape_config_ocpus:
-    type: integer
-    minimum: 1
-    maximum: 64
-    title: "Number of OCPUs"
-    visible:
-      and:
-        - and:
-          - create_new_oke_cluster
-        - or:
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.E3.Flex"
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.E4.Flex"
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.A1.Flex"
-
-  node_pool_node_shape_config_memory_in_gbs:
-    type: integer
-    minimum: 1
-    maximum: 1024
-    title: "Amount of memory (GB)"
-    visible:
-      and:
-        - and:
-          - create_new_oke_cluster
-        - or:
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.E3.Flex"
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.E4.Flex"
-          - eq:
-            - node_pool_shape 
-            - "VM.Standard.A1.Flex"
-
   node_pool_name:
     type: string
     title: "Node Pool Name"
@@ -446,7 +404,7 @@ variables:
           - create_tenancy_policies
         - not:
           - create_dynamic_group_for_nodes_in_compartment
-        
+
   create_compartment_policies:
     type: boolean
     title: "Create Compartment Policies"
@@ -546,7 +504,7 @@ variables:
           - show_advanced
           - ingress_nginx_enabled
         - eq:
-          - ingress_load_balancer_shape 
+          - ingress_load_balancer_shape
           - "flexible"
 
   ingress_load_balancer_shape_flex_max:
@@ -561,7 +519,7 @@ variables:
           - show_advanced
           - ingress_nginx_enabled
         - eq:
-          - ingress_load_balancer_shape 
+          - ingress_load_balancer_shape
           - "flexible"
 
   ingress_hosts:
@@ -632,7 +590,7 @@ variables:
   oda_enabled:
     type: boolean
     title: "Enable Oracle Digital Assistant support?"
-  
+
   oda_uri:
     type: string
     title: "Oracle Digital Assistant URI"