Release v1.2.0 (#64)

* Pull request #46: New Networking Setup

Merge in OSO/openshift-terraform-stack from yutpeng/OSO-439 to dev-1.2.0

Squashed commit of the following:

commit e5ce5662158315ac1217d8e90e43f788646e4c10
Author: yutpeng <yuting.peng@oracle.com>
Date:   Mon Apr 21 16:45:35 2025 -0700

    new networking configuration

* Pull request #45: Add validations on tag namespace

Merge in OSO/openshift-terraform-stack from yutpeng/update-create-instance-role-tags-description to dev-1.2.0

Squashed commit of the following:

commit d414ece3270666aaca2e68f69484f9d0afca5c95
Author: yutpeng <yuting.peng@oracle.com>
Date:   Wed Apr 16 14:27:53 2025 -0700

    add validations on tag namespace

* Pull request #47: update schema for v1.2.0

Merge in OSO/openshift-terraform-stack from yutpeng/schema-update-for-v1.2.0 to dev-1.2.0

Squashed commit of the following:

commit bfc6456f0036206de5bcb78d19f0b4f546864015
Author: yutpeng <yuting.peng@oracle.com>
Date:   Tue May 6 13:14:02 2025 -0700

    update schema for v1.2.0

* set version to v1.2.0

* update default shape to E5

---------

Co-authored-by: davidfos <david.d.foster@oracle.com>

Author: yutpeng

Makefile

@@ -1,5 +1,5 @@
 SHELL = bash
-PKG_VERSION ?= v1.1.1
+PKG_VERSION ?= v1.2.0
 OCI_DRIVER_VERSION ?= v1.30.0
 PRE_COMMIT := $(shell command -v pre-commit 2> /dev/null)
 PODMAN := $(shell command -v podman 2> /dev/null)

terraform-stacks/README.md

@@ -69,8 +69,8 @@ Create the OCI resources for a new OpenShift cluster.
         - Public Security List
     - Subnets
         - "public"
-        - "private"
-        - "private_two"
+        - "private_opc"
+        - "private_bare_metal"
     - NSGs (Network Security Groups)
         - "cluster-lb-nsg"
         - "cluster-controlplane-nsg"
@@ -101,15 +101,15 @@ Create the OCI resources for a new OpenShift cluster.
 
 - **Control Plane**
     - Count: 3
-    - Shape: VM.Standard.E4.Flex
+    - Shape: VM.Standard.E5.Flex
     - OCPU: 4
     - Memory: 16 GB
     - Boot Volume
         - Size: 1024 GB
         - VPUs/GB: 100
 - **Compute**
     - Count: 3
-    - Shape: VM.Standard.E4.Flex
+    - Shape: VM.Standard.E5.Flex
     - OCPU: 6
     - Memory: 16 GB
     - Boot Volume
@@ -142,7 +142,7 @@ Create the OCI resources for a new OpenShift cluster.
 - **Compute**
     - Count: 0
 
-## create-tags
+## create-instance-role-tags
 
 OCI tagging resources that are used to tag OpenShift cluster OCI resources. The tags are used to identify cluster-specific resources and should not be deleted while in use.
 
@@ -160,4 +160,4 @@ It is recommended but not required to create and reuse tags for your OpenShift c
             - "compute"
         - "boot-volume-type"
             - "PARAVIRTUALIZED"
-            - "ISCSI"
+            - "ISCSI"

terraform-stacks/add-nodes/checksums

@@ -1,6 +1,6 @@
-c3687db1b25a34238ed49fbb4a74fb87886531bb43108d4a0352b65cac99fbdc  data.tf
+1d7a1314b5d75e0feccef88d786afd68cd2cd9e9213426b15f58b1a41823064c  data.tf
 78b9bcea0d7397d2f1b4f584c2d2e76d67dc085b74e38c9cd3b32e6e1823f399  locals.tf
-d289fd822e5cf258f4e347280c1aefbe8e884bc5a55eba1774dd9f111914cd74  main.tf
+22b2c3a1ff67f77f8d05a2806460dd2f0e5112fdcfeedca07951a30024050986  main.tf
 236fb28a0fa6c306cefa8e82b73bf938cd9c5744a8b4e70208911cab882aaf90  output.tf
-176825825380e478d05e18bad4d2fedb75ad5700009a665168f243ce5a65558e  variables.tf
-b18c5f6c0199c26151872481e5e3a0e3fee05e410b074ebb501960f5fd388004  version.tf
+21d36d8b1c491b78fb1673c674ef1cd522969f5ef276218df1a47d89ba3190b3  variables.tf
+65be788ed9f950ee102fbe862a345dcbacf58b3ea18dc68e360bf4e720310529  version.tf

terraform-stacks/add-nodes/data.tf

@@ -34,15 +34,15 @@ data "oci_core_vcns" "cluster_vcn" {
   display_name   = var.cluster_name
 }
 
-data "oci_core_subnets" "private" {
+data "oci_core_subnets" "private_opc" {
   compartment_id = var.compartment_ocid
-  display_name   = "private"
+  display_name   = "private_opc"
   vcn_id         = data.oci_core_vcns.cluster_vcn.virtual_networks[0].id
 }
 
-data "oci_core_subnets" "private2" {
+data "oci_core_subnets" "private_bare_metal" {
   compartment_id = var.compartment_ocid
-  display_name   = "private_two"
+  display_name   = "private_bare_metal"
   vcn_id         = data.oci_core_vcns.cluster_vcn.virtual_networks[0].id
 }
 

terraform-stacks/add-nodes/main.tf

@@ -93,11 +93,12 @@ module "compute" {
   op_openshift_tag_instance_role    = module.tags.op_openshift_tag_instance_role
 
   // Depedency on image
-  op_image_openshift_image = module.image.op_image_openshift_image
+  op_image_openshift_image_paravirtualized = module.image.op_image_openshift_image_paravirtualized
+  op_image_openshift_image_native          = module.image.op_image_openshift_image_native
 
   // Depedency on networks
-  op_subnet_private                                  = data.oci_core_subnets.private.subnets[0].id
-  op_subnet_private2                                 = local.is_control_plane_iscsi_type || local.is_compute_iscsi_type ? data.oci_core_subnets.private2.subnets[0].id : null
+  op_subnet_private_opc                              = data.oci_core_subnets.private_opc.subnets[0].id
+  op_subnet_private_bare_metal                       = data.oci_core_subnets.private_bare_metal.subnets[0].id
   op_network_security_group_cluster_controlplane_nsg = data.oci_core_network_security_groups.cluster_controlplane_nsg.network_security_groups[0].id
   op_network_security_group_cluster_compute_nsg      = data.oci_core_network_security_groups.cluster_compute_nsg.network_security_groups[0].id
 

terraform-stacks/add-nodes/schema.yaml

@@ -3,7 +3,7 @@
 #
 
 title: Adding Nodes to OpenShift Cluster on OCI
-description: OpenShift on OCI
+description: A Terraform Stack for creating resources required for adding nodes to OpenShift Cluster on OCI
 schemaVersion: 1.1.0
 version: "20241106"
 locale: "en"
@@ -18,6 +18,10 @@ variableGroups:
     - cluster_instance_role_tag_namespace
     - openshift_image_source_uri
 
+- title: "OpenShift Resource Attribution Tags"
+  variables:
+    - tag_namespace_compartment_ocid_resource_tagging
+
 - title: "Control Plane Node Configuration"
   variables:
     - control_plane_shape
@@ -41,10 +45,6 @@ variableGroups:
     - distribute_compute_instances_across_ads
     - starting_ad_name_compute
 
-- title: "OpenShift Resources Attribution Tagging"
-  variables:
-    - tag_namespace_compartment_ocid_resource_tagging
-
 ###########
 # VARIABLES
 ###########
@@ -86,14 +86,25 @@ variables:
     type: string
 
   #
-  # Control Plane Configuration Variables
+  # OpenShift Resource Attribution Tag Variables
   #
+  tag_namespace_compartment_ocid_resource_tagging:
+    type: oci:identity:compartment:id
+    title: Tag Namespace Compartment For OpenShift Resource Attribution Tagging
+    description: WARNING - Please make sure this tag exists before you apply the terraform stack. The compartment where the tag namespace for resource tagging should be created. Defaults to current compartment. The tag namespace and defined tags for OpenShift Attribution on OCI resources will be `openshift-tags` and `openshift-resource`.
+      If this namespace already exists, the field should be verified to ensure it is correctly defined and applied.
+      Example --> "defined-tags" - {"openshift-tags"- {"openshift-resource" - "openshift-resource-infra"} }
+    default: compartment_ocid
+    required: true
 
+  #
+  # Control Plane Configuration Variables
+  #
   control_plane_shape:
     type: string
     title: Control Plane Shape
     description: Compute Instance shape of control plan nodes. For more detail regarding supported shapes, please visit https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes
-    default: "VM.Standard.E4.Flex"
+    default: "VM.Standard.E5.Flex"
     required: true
 
   control_plane_count:
@@ -163,7 +174,7 @@ variables:
     type: string
     title: Compute Shape
     description: Compute Instance shape of compute nodes. For more detail regarding supported shapes, please visit https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes
-    default: "VM.Standard.E4.Flex"
+    default: "VM.Standard.E5.Flex"
     required: true
 
   compute_count:
@@ -224,12 +235,3 @@ variables:
     dependsOn:
       compartmentId: ${compartment_ocid}
     required: false
-
-  tag_namespace_compartment_ocid_resource_tagging:
-    type: oci:identity:compartment:id
-    title: Tag Namespace Compartment For OpenShift Resource Attribution Tagging
-    description: WARNING - Please make sure this tag exists before you apply the terraform stack. The compartment where the tag namespace for resource tagging should be created. Defaults to current compartment. The tag namespace and defined tags for OpenShift Attribution on OCI resources will be `openshift-tags` and `openshift-resource`.
-      If this namespace already exists, the field should be verified to ensure it is correctly defined and applied.
-      Example --> "defined-tags" - {"openshift-tags"- {"openshift-resource" - "openshift-resource-infra"} }
-    default: compartment_ocid
-    required: true

terraform-stacks/add-nodes/variables.tf

@@ -5,9 +5,9 @@ variable "control_plane_count" {
 }
 
 variable "control_plane_shape" {
-  default     = "VM.Standard.E4.Flex"
+  default     = "VM.Standard.E5.Flex"
   type        = string
-  description = "Compute shape of the control_plane nodes. The default shape is VM.Standard.E4.Flex for VM setup and BM.Standard3.64 for BM setup. For more detail regarding supported shapes, please visit https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes"
+  description = "Compute shape of the control_plane nodes. The default shape is VM.Standard.E5.Flex for VM setup and BM.Standard3.64 for BM setup. For more detail regarding supported shapes, please visit https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes"
 }
 
 variable "control_plane_ocpu" {
@@ -61,7 +61,7 @@ variable "compute_count" {
 }
 
 variable "compute_shape" {
-  default     = "VM.Standard.E4.Flex"
+  default     = "VM.Standard.E5.Flex"
   type        = string
   description = "Compute shape of the compute nodes. The default shape is BM.Standard3.64. For more detail regarding supported shapes, please visit https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes"
 }

terraform-stacks/add-nodes/version.tf

@@ -1,3 +1,3 @@
 locals {
-  stack_version = "v1.1.1"
+  stack_version = "v1.2.0"
 }

terraform-stacks/create-cluster/checksums

@@ -1,5 +1,5 @@
-ef66a14899c2a0e1e1c13920f29fec70f71e17ec4a9de38d6dcd294886706d3f  locals.tf
-f9ab9d35fa6ff0f7a30196dd87658267e33e7aa2f0e6e1b8a5b11d6a177c6d57  main.tf
+ca99dc7e9c0636575d58aed6dbb326d7efab708d9fb88d294d87cf8006c1ccdb  locals.tf
+fa3a9ac9d57f076c77875421aac8d7874774528c5c2eab57b8d3f37051e20116  main.tf
 2f4a0f1b16b320f520f6b431a4bb84698fe76f45dfe7ac1946ecd494890a9654  output.tf
-96f0605ff7c84a6b7e2deb59687818118d3a034a1cc20b13facc61f4467c5689  variables.tf
-b18c5f6c0199c26151872481e5e3a0e3fee05e410b074ebb501960f5fd388004  version.tf
+0fd13d8de685bc03ad8474a77dc94c16d60e8e5c7e6319de54b4e7a375362dad  variables.tf
+65be788ed9f950ee102fbe862a345dcbacf58b3ea18dc68e360bf4e720310529  version.tf

terraform-stacks/create-cluster/locals.tf

@@ -16,6 +16,6 @@ locals {
   is_control_plane_iscsi_type = can(regex("^BM\\..*$", var.control_plane_shape))
   is_compute_iscsi_type       = can(regex("^BM\\..*$", var.compute_shape))
 
-  subnet_id        = var.enable_private_dns && !local.is_control_plane_iscsi_type && !local.is_compute_iscsi_type ? module.network.op_subnet_private : var.enable_private_dns ? module.network.op_subnet_private2 : module.network.op_subnet_public
+  subnet_id        = var.enable_private_dns ? module.network.op_subnet_private_opc : module.network.op_subnet_public
   security_list_id = var.enable_private_dns ? module.network.op_security_list_private : module.network.op_security_list_public
 }

terraform-stacks/create-cluster/main.tf

@@ -89,11 +89,11 @@ module "network" {
   compartment_ocid = var.compartment_ocid
   cluster_name     = var.cluster_name
 
-  vcn_cidr       = var.vcn_cidr
-  private_cidr   = var.private_cidr
-  private_cidr_2 = var.private_cidr_2
-  public_cidr    = var.public_cidr
-  vcn_dns_label  = var.vcn_dns_label
+  vcn_cidr                = var.vcn_cidr
+  private_cidr_opc        = var.private_cidr_opc
+  private_cidr_bare_metal = var.private_cidr_bare_metal
+  public_cidr             = var.public_cidr
+  vcn_dns_label           = var.vcn_dns_label
 
   // Depedency on tags
   defined_tags = module.resource_attribution_tags.openshift_resource_attribution_tag
@@ -102,10 +102,8 @@ module "network" {
 module "load_balancer" {
   source = "./shared_modules/lb"
 
-  compartment_ocid            = var.compartment_ocid
-  cluster_name                = var.cluster_name
-  is_control_plane_iscsi_type = local.is_control_plane_iscsi_type
-  is_compute_iscsi_type       = local.is_compute_iscsi_type
+  compartment_ocid = var.compartment_ocid
+  cluster_name     = var.cluster_name
 
   enable_private_dns                                    = var.enable_private_dns
   load_balancer_shape_details_maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
@@ -115,8 +113,7 @@ module "load_balancer" {
   defined_tags = module.resource_attribution_tags.openshift_resource_attribution_tag
 
   // Depedency on networks
-  op_subnet_private                        = module.network.op_subnet_private
-  op_subnet_private2                       = module.network.op_subnet_private2
+  op_subnet_private_opc                    = module.network.op_subnet_private_opc
   op_subnet_public                         = module.network.op_subnet_public
   op_network_security_group_cluster_lb_nsg = module.network.op_network_security_group_cluster_lb_nsg
 }
@@ -155,11 +152,12 @@ module "compute" {
   op_openshift_tag_instance_role    = module.tags.op_openshift_tag_instance_role
 
   // Depedency on image
-  op_image_openshift_image = module.image.op_image_openshift_image
+  op_image_openshift_image_native          = module.image.op_image_openshift_image_native
+  op_image_openshift_image_paravirtualized = module.image.op_image_openshift_image_paravirtualized
 
   // Depedency on networks
-  op_subnet_private                                  = module.network.op_subnet_private
-  op_subnet_private2                                 = module.network.op_subnet_private2
+  op_subnet_private_opc                              = module.network.op_subnet_private_opc
+  op_subnet_private_bare_metal                       = module.network.op_subnet_private_bare_metal
   op_network_security_group_cluster_controlplane_nsg = module.network.op_network_security_group_cluster_controlplane_nsg
   op_network_security_group_cluster_compute_nsg      = module.network.op_network_security_group_cluster_compute_nsg