Development (#232)

Merge development into main

---------

Co-authored-by: Abhijit Paranjpe <[email protected]>
Co-authored-by: telake <[email protected]>

Author: 3 people

terraform/images/mp_image_ee_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaax4pfhhb2qhinklrkrnmjrqqbvvis72b5mod4yohz6m7yviejq7rq"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaatomkczyox3g5pnw4oquxijcl7urcmp6s4ozmthj62h727ec7uevq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
+ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"

terraform/images/mp_image_ee_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"

terraform/images/mp_image_se_byol.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazcjnpfj43scz2d6e3fxzkbcxtr3fnqeaymn2erq46jmvzhpqdzya"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa6mhaqaxk5t7xwagusc36hnoimhkqqlihvcho2ndlx2onj67u2juq"

terraform/images/mp_image_suite_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaainafum2ncqjoyuwvfbl4vi6fnfutueuinn3g2mgvfzgquk6xqjkq"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa22tkmyuks4hfntwc3gpsdq5dnnkmlesvj6nlaxmhb6mw2jvlx2oq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
+ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"

terraform/images/mp_image_suite_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"

terraform/modules/compute/wls_compute/validators.tf

@@ -7,12 +7,12 @@ locals {
     #Dummy map to trigger an error in case we detect a validation error.
   }
   is_std_flex_shape                  = var.instance_shape.instanceShape == "VM.Standard.E3.Flex" || var.instance_shape.instanceShape == "VM.Standard.E4.Flex" || var.instance_shape.instanceShape == "VM.Standard3.Flex"
-  invalid_ocpu_count_standard_shape  = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : false
+  invalid_ocpu_count_standard_shape  = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : var.instance_shape.instanceShape == "VM.Standard.E5.Flex" ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 94) : false
   is_optimized_flex_shape            = var.instance_shape.instanceShape == "VM.Optimized3.Flex"
   invalid_ocpu_count_optimized_shape = local.is_optimized_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 18) : false
 
   #Flex shape validations
-  invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shape [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus."
+  invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shapes [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus and VM.Standard.E5.Flex supports a maximum of 94 ocpus."
   validate_standard_flex_shape_ocpus    = local.invalid_ocpu_count_standard_shape ? local.validators_msg_map[local.invalid_standard_flex_shape_ocpus_msg] : null
 
   invalid_optimized_flex_shape_ocpus_msg = "WLSC-ERROR: The VM.Optimized3.Flex instance shape supports maximum 18 ocpus."

terraform/schema.yaml

@@ -394,9 +394,9 @@ variables:
   wls_ocpu_count:
     type: integer
     title: "OCPU Count"
-    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
+    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
     minimum: 1
-    maximum: 64
+    maximum: 94
     multipleOf: 1
     default: 1
     required: true
@@ -410,6 +410,9 @@ variables:
         - eq:
           - ${instance_shape}
           - "VM.Standard.E4.Flex"
+        - eq:
+          - ${instance_shape}
+          - "VM.Standard.E5.Flex"
         - eq:
           - ${instance_shape}
           - "VM.Optimized3.Flex"

terraform/schema_14110.yaml

@@ -392,9 +392,9 @@ variables:
   wls_ocpu_count:
     type: integer
     title: "OCPU Count"
-    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
+    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
     minimum: 1
-    maximum: 64
+    maximum: 94
     multipleOf: 1
     default: 1
     required: true
@@ -408,6 +408,9 @@ variables:
         - eq:
           - ${instance_shape}
           - "VM.Standard.E4.Flex"
+        - eq:
+          - ${instance_shape}
+          - "VM.Standard.E5.Flex"
         - eq:
           - ${instance_shape}
           - "VM.Optimized3.Flex"