Release v1.4.2 (#77)

Author: dfoster-oracle

Makefile

@@ -1,6 +1,6 @@
 SHELL = bash
 
-PKG_VERSION ?= v1.4.1
+PKG_VERSION ?= v1.4.2
 OCI_DRIVER_VERSION ?= v1.32.0
 
 PRE_COMMIT := $(shell command -v pre-commit 2> /dev/null)

custom_manifests/manifests/01-oci-csi.yml

@@ -517,17 +517,17 @@ parameters:
 
 ---
 
-# # https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
-# apiVersion: snapshot.storage.k8s.io/v1
-# kind: VolumeSnapshotClass
-# metadata:
-#   name: oci-snapshot
-#   annotations:
-#     snapshot.storage.kubernetes.io/is-default-class: "true"
-# driver: blockvolume.csi.oraclecloud.com
-# parameters:
-#   backupType: full
-# deletionPolicy: Delete
+# https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: oci-snapshot
+  annotations:
+    snapshot.storage.kubernetes.io/is-default-class: "true"
+driver: blockvolume.csi.oraclecloud.com
+parameters:
+  backupType: full
+deletionPolicy: Delete
 
 ---
 

custom_manifests/oci-ccm-csi-drivers/v1.32.0-UHP/01-oci-csi.yml

@@ -532,17 +532,17 @@ reclaimPolicy: Delete
 
 ---
 
-# # https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
-# apiVersion: snapshot.storage.k8s.io/v1
-# kind: VolumeSnapshotClass
-# metadata:
-#   name: oci-snapshot
-#   annotations:
-#     snapshot.storage.kubernetes.io/is-default-class: "true"
-# driver: blockvolume.csi.oraclecloud.com
-# parameters:
-#   backupType: full
-# deletionPolicy: Delete
+# https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: oci-snapshot
+  annotations:
+    snapshot.storage.kubernetes.io/is-default-class: "true"
+driver: blockvolume.csi.oraclecloud.com
+parameters:
+  backupType: full
+deletionPolicy: Delete
 
 ---
 

custom_manifests/oci-ccm-csi-drivers/v1.32.0/01-oci-csi.yml

@@ -517,17 +517,17 @@ parameters:
 
 ---
 
-# # https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
-# apiVersion: snapshot.storage.k8s.io/v1
-# kind: VolumeSnapshotClass
-# metadata:
-#   name: oci-snapshot
-#   annotations:
-#     snapshot.storage.kubernetes.io/is-default-class: "true"
-# driver: blockvolume.csi.oraclecloud.com
-# parameters:
-#   backupType: full
-# deletionPolicy: Delete
+# https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/volume-snapshot-and-restore-using-csi.md
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: oci-snapshot
+  annotations:
+    snapshot.storage.kubernetes.io/is-default-class: "true"
+driver: blockvolume.csi.oraclecloud.com
+parameters:
+  backupType: full
+deletionPolicy: Delete
 
 ---
 

docs/openshift-virtualization.md

@@ -4,12 +4,12 @@
 - [Limits and Considerations](#limitations-and-considerations)
 - [Installation](#installation)
 
-[OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/virtualization/index) provides scalable, enterprise-grade virtualization in OpenShift. You can use it to manage virtual machines (VMs) exclusively or alongside container workloads. Another use-case for OpenShift Virtualization is as a migration destination for VMs moving from vSphere to OpenShift using the Migration Toolkit for Virtualization.
+[OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/virtualization/index) provides scalable, enterprise-grade virtualization in OpenShift. You can use it to manage virtual machines (VMs) exclusively or alongside container workloads. Another use-case for OpenShift Virtualization is as a migration destination for VMs moving from vSphere to OpenShift using the Migration Toolkit for Virtualization.
 
 In collaboration with Red Hat and their Virtualization team, OpenShift Virtualization is available for OpenShift on OCI.
 
 For more information, see:
-- [Red Hat - Planning and Installing OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/virtualization/getting-started#planning-and-installing-virt_virt-getting-started)
+- [Red Hat - Planning and Installing OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/virtualization/getting-started#planning-and-installing-virt_virt-getting-started)
 - [Red Hat - Migration Toolkit for Virtualization](https://developers.redhat.com/products/mtv/overview)
 
 ## Prerequisites
@@ -25,7 +25,7 @@ We also recommend that you use Ultra High Performance Raw Block Volumes (UHP RBV
 
 For more information, see:
 - [oci-openshift - STORAGE.md](/docs/STORAGE.md)
-- [Red Hat - Planning a bare metal cluster for OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html-single/installing_on_bare_metal/index#virt-planning-bare-metal-cluster-for-ocp-virt_preparing-to-install-on-bare-metal)
+- [Red Hat - Planning a bare metal cluster for OpenShift Virtualization](https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/installing_on_bare_metal/index#virt-planning-bare-metal-cluster-for-ocp-virt_preparing-to-install-on-bare-metal)
 - [OCI - OpenShift on OCI: Supported Shapes](https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes)
 - [OCI - Bare Metal Compute Shapes](https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#baremetalshapes)
 - [OCI - Ultra High Performance Block Volumes](https://docs.oracle.com/en-us/iaas/Content/Block/Concepts/blockvolumeultrahighperformance.htm)
@@ -87,39 +87,41 @@ reclaimPolicy: Delete
 ---
 
 ### Installing OpenShift Virtualization
-1. Follow the [installation](https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/virtualization/installing#virt-installing-virt-operator_installing-virt) documentation from Red Hat to install the OpenShift Virtualization operator.
+1. Follow the [installation](https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/virtualization/installing#virt-installing-virt-operator_installing-virt) documentation from Red Hat to install the OpenShift Virtualization operator.
 
-2. After you have installed the OpenShift Virtualization operator and created your HyperConverged instance, you need to [update](https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/virtualization/storage#virt-configuring-storage-profile) the StorageProfile for your **default** StorageClass:
-    ```
+2. After you have installed the OpenShift Virtualization operator and created your HyperConverged instance, verify the StorageProfiles created by HyperConverged and [update](https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/virtualization/storage#virt-configuring-storage-profile) them if needed:
+    ```bash
     oc patch storageprofile oci-bv-uhp --type=merge -p '{"spec": {"claimPropertySets": [{"accessModes": ["ReadWriteMany","ReadWriteOnce"], "volumeMode": "Block"}], "cloneStrategy": "csi-clone"}}'
     ```
 
-3. To clone VMs, you must have a **default** StorageClass. If no StorageClass is annotated as the **default**, you can patch an existing StorageClass. For Ultra High Performance (UHP) Block Volumes, use `oci-bv-uhp`:
-    ```
+3. You must have a **default** StorageClass for OpenShift Virtualization. If no StorageClass is annotated as the **default**, you can annotate/patch an existing StorageClass. For Ultra High Performance (UHP) Block Volumes, use `oci-bv-uhp` from the [Using the UHP CSI Driver](#using-the-uhp-csi-driver):
+
+    Annotate it if necessary:
+    ```bash
     oc patch storageclass oci-bv-uhp -p '{"metadata": {"annotations": {"storageclass.kubernetes.io/is-default-class": "true"}}}'
     ```
 
-4. **If you want to be able to clone VMs or use snapshot/restore operations, you must manually create the `VolumeSnapshotClass` resource after installation.**
-The OCI CSI driver supports snapshotting, but the `VolumeSnapshotClass` is **not installed by default** for compatibility reasons.
-Create the following manifest and apply it to your cluster:
-
-```yaml
-apiVersion: snapshot.storage.k8s.io/v1
-kind: VolumeSnapshotClass
-metadata:
-  name: oci-snapshot
-  annotations:
-    snapshot.storage.kubernetes.io/is-default-class: "true"
-driver: blockvolume.csi.oraclecloud.com
-parameters:
-  backupType: full
-deletionPolicy: Delete
-```
+4. The OCI CSI driver supports snapshotting, and if you want to be able to clone VMs or perform snapshot/restore operations, you must have a **default** `VolumeSnapshotClass`. The `oci-snapshot` `VolumeSnapshotClass` is annotated as the **default** and included in the `dynamic_custom_manifest` output from `create-cluster` (**>=v1.4.2**).
+
+    If you are missing a `VolumeSnapshotClass` and need to add one to an existing cluster, review the following manifest and apply it to your cluster:
+
+    ```yaml
+    apiVersion: snapshot.storage.k8s.io/v1
+    kind: VolumeSnapshotClass
+    metadata:
+      name: oci-snapshot
+      annotations:
+        snapshot.storage.kubernetes.io/is-default-class: "true"
+    driver: blockvolume.csi.oraclecloud.com
+    parameters:
+      backupType: full
+    deletionPolicy: Delete
+    ```
 
-Apply it with:
+    Apply it with:
 
-```bash
-oc apply -f <your-volumesnapshotclass-file>.yaml
-```
+    ```bash
+    oc apply -f oci-snapshot.yaml
+    ```
 
 For more details, see [STORAGE.md - Enabling VolumeSnapshotClass](/docs/STORAGE.md#enabling-volumesnapshotclass).

terraform-stacks/README.md

@@ -85,9 +85,9 @@ Create the OCI resources for an OpenShift cluster on OCI and facilitate the inst
     - Count: 3
     - Shape: VM.Standard.E5.Flex
     - OCPU: 6
-    - Memory: 16 GB
+    - Memory: 32 GB
     - Boot Volume
-        - Size: 1024 GB
+        - Size: 300 GB
         - VPUs/GB: 30
 
 #### OCI Resources
@@ -166,9 +166,9 @@ Create the OCI resources for an OpenShift cluster on OCI and facilitate the inst
     - Count: 3
     - Shape: VM.Standard.E5.Flex
     - OCPU: 6
-    - Memory: 16 GB
+    - Memory: 32 GB
     - Boot Volume
-        - Size: 100 GB
+        - Size: 300 GB
         - VPUs/GB: 30
 
 #### Compact Bare Metal

terraform-stacks/add-nodes/schema.yaml

@@ -1,11 +1,7 @@
-#
-# Copyright (c) 2024 Oracle and/or its affiliates. Licensed under the Universal Permissive License (UPL), Version 1.0. See LICENSE for more details.
-#
-
-title: Adding Nodes to OpenShift Cluster on OCI
+title: Add Nodes to OpenShift Cluster on OCI - v1.4.2
 description: A Terraform Stack for creating resources required for adding nodes to OpenShift Cluster on OCI
-schemaVersion: 1.1.0
-version: "20241106"
+schemaVersion: 1.4.2
+version: "20250916"
 locale: "en"
 
 
@@ -227,49 +223,37 @@ variables:
   compute_shape:
     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.E5.Flex"
     required: true
 
   compute_count:
     type: integer
     title: Compute Node Count
-    description: The number of compute nodes to add to the cluster. The default value is 1.
     required: true
-    default: 1
 
   compute_ocpu:
     type: integer
     title: Compute Node OCPU
-    description: The number of OCPUs available for the shape of each compute node. The default value is 6.
-    default: 6
     minimum: 1
     maximum: 144
     required: true
 
   compute_memory:
     type: integer
     title: Compute Node Memory
-    description: The amount of memory available for the shape of each compute node, in gigabytes. The default value is 16.
-    default: 16
     minimum: 1
     maximum: 1760
     required: true
 
   compute_boot_size:
     type: integer
     title: Compute Node Boot Volume
-    description: The size of the boot volume of each compute node in GBs. The minimum value is 50 GB and the maximum value is 32,768 GB (32 TB). The default value is 100 GB.
-    default: 100
     minimum: 50
     maximum: 32768
     required: true
 
   compute_boot_volume_vpus_per_gb:
     type: integer
     title: Compute Node VPU
-    description: The number of volume performance units (VPUs) that will be applied to this volume per GB of each compute node. The default value is 30.
-    default: 30
     minimum: 10
     maximum: 120
     multipleOf: 10

terraform-stacks/add-nodes/variables.tf

@@ -63,13 +63,13 @@ variable "compute_count" {
 variable "compute_shape" {
   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"
+  description = "Compute shape of the compute nodes. The default shape is VM.Standard.E5.Flex for VM setup and BM.Standard3.64 for BM setup. For more details regarding supported shapes, review OpenShift on OCI <a href='https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes'>supported shapes</a>."
 }
 
 variable "compute_ocpu" {
   default     = 6
   type        = number
-  description = "The number of OCPUs available for the shape of each compute node. The default value is 4. "
+  description = "The number of OCPUs available for the shape of each compute node."
 
   validation {
     condition     = var.compute_ocpu >= 1 && var.compute_ocpu <= 114
@@ -89,9 +89,9 @@ variable "compute_boot_volume_vpus_per_gb" {
 }
 
 variable "compute_memory" {
-  default     = 16
+  default     = 32
   type        = number
-  description = "The amount of memory available for the shape of each compute node, in gigabytes. The default value is 16."
+  description = "The amount of memory available for the shape of each compute node, in gigabytes."
 
   validation {
     condition     = var.compute_memory >= 1 && var.compute_memory <= 1760
@@ -100,9 +100,9 @@ variable "compute_memory" {
 }
 
 variable "compute_boot_size" {
-  default     = 100
+  default     = 300
   type        = number
-  description = "The size of the boot volume of each compute node in GBs. The minimum value is 50 GB and the maximum value is 32,768 GB (32 TB). The default value is 100 GB."
+  description = "The size of the boot volume of each compute node in GBs. The minimum value is 50 GB and the maximum value is 32,768 GB (32 TB)."
 
   validation {
     condition     = var.compute_boot_size >= 50 && var.compute_boot_size <= 32768

terraform-stacks/add-nodes/version.tf

@@ -1,3 +1,3 @@
 locals {
-  stack_version = "v1.4.1"
+  stack_version = "v1.4.2"
 }

terraform-stacks/create-cluster/schema.yaml

@@ -1,11 +1,7 @@
-#
-# Copyright (c) 2019-2020 Oracle and/or its affiliates. All rights reserved.
-#
-
-title: OpenShift on OCI
+title: OpenShift Cluster on OCI - v1.4.2
 description: A Terraform Stack for creating resources required for installing OpenShift on OCI
-schemaVersion: 1.2.0
-version: "20250602"
+schemaVersion: 1.4.2
+version: "20250916"
 locale: "en"
 
 variableGroups:
@@ -368,49 +364,38 @@ variables:
   compute_shape:
     type: string
     title: Compute Shape
-    description: Compute Instance shape of compute nodes. For more details, review OpenShift on OCI <a href='https://docs.oracle.com/en-us/iaas/Content/openshift-on-oci/overview.htm#supported-shapes'>supported shapes</a>
     default: "VM.Standard.E5.Flex"
     required: true
 
   compute_count:
     type: integer
     title: Compute Node Count
-    description: The number of compute nodes in the cluster. The default value is 3.
     required: true
-    default: 3
 
   compute_ocpu:
     type: integer
     title: Compute Node OCPU
-    description: The number of OCPUs available for the shape of each compute node. The default value is 6.
-    default: 6
     minimum: 1
     maximum: 144
     required: true
 
   compute_memory:
     type: integer
     title: Compute Node Memory
-    description: The amount of memory available for the shape of each compute node, in gigabytes. The default value is 16.
-    default: 16
     minimum: 1
     maximum: 1760
     required: true
 
   compute_boot_size:
     type: integer
     title: Compute Node Boot Volume
-    description: The size of the boot volume of each compute node in GBs. The minimum value is 50 GB and the maximum value is 32,768 GB (32 TB). The default value is 100 GB.
-    default: 100
     minimum: 50
     maximum: 32768
     required: true
 
   compute_boot_volume_vpus_per_gb:
     type: integer
     title: Compute Node VPU
-    description: The number of volume performance units (VPUs) that will be applied to this volume per GB of each compute node. The default value is 30.
-    default: 30
     minimum: 10
     maximum: 120
     multipleOf: 10