From f059341895cca531d9d2d26b8d3da8db1892a58e Mon Sep 17 00:00:00 2001 From: radeore Date: Wed, 1 Apr 2026 10:21:21 -0400 Subject: [PATCH 1/2] Fix UltraSSD StorageClass to not override cluster default --- ...pre-set-default-azure-disk-ultrassd-commands.sh | 14 -------------- ...ss-pre-set-default-azure-disk-ultrassd-ref.yaml | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh index 85f9810f3fcf4..d84e68011ed16 100644 --- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh +++ b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh @@ -8,8 +8,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: managed-csi-ultrassd - annotations: - storageclass.kubernetes.io/is-default-class: "true" provisioner: disk.csi.azure.com parameters: skuName: UltraSSD_LRS @@ -17,15 +15,3 @@ volumeBindingMode: WaitForFirstConsumer allowVolumeExpansion: true reclaimPolicy: Delete EOF - -cat << EOF > ${SHARED_DIR}/manifest_cluster_csi_driver.yaml -apiVersion: operator.openshift.io/v1 -kind: "ClusterCSIDriver" -metadata: - name: "disk.csi.azure.com" -spec: - logLevel: Normal - managementState: Managed - operatorLogLevel: Normal - storageClassState: Unmanaged -EOF diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml index 1597207881546..044a7c06ac490 100644 --- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml +++ b/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml @@ -8,5 +8,5 @@ ref: cpu: 10m memory: 100Mi documentation: |- - The `storage-conf-storageclass-pre-set-default-azure-disk-ultrassd` step sets the cluster - default storageclass to an UltraSSD_LRS Azure Disk one before ipi-install. + The `storage-conf-storageclass-pre-set-default-azure-disk-ultrassd` step creates an + additional UltraSSD_LRS Azure Disk StorageClass before ipi-install. From 684bc0f76b609f9ece9775ac22cf474cadaed9be Mon Sep 17 00:00:00 2001 From: radeore Date: Thu, 2 Apr 2026 15:04:04 -0400 Subject: [PATCH 2/2] Update file names and SC create approach --- .../openshift-e2e-azure-csi-ultrassd-workflow.yaml | 4 ++-- .../OWNERS | 0 ...storageclass-add-azure-disk-ultrassd-commands.sh} | 2 +- ...geclass-add-azure-disk-ultrassd-ref.metadata.json | 11 +++++++++++ ...onf-storageclass-add-azure-disk-ultrassd-ref.yaml | 12 ++++++++++++ ...set-default-azure-disk-ultrassd-ref.metadata.json | 11 ----------- ...lass-pre-set-default-azure-disk-ultrassd-ref.yaml | 12 ------------ 7 files changed, 26 insertions(+), 26 deletions(-) rename ci-operator/step-registry/storage/conf/storageclass/{pre-set-default-azure-disk-ultrassd => add-azure-disk-ultrassd}/OWNERS (100%) rename ci-operator/step-registry/storage/conf/storageclass/{pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh => add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh} (85%) create mode 100644 ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.metadata.json create mode 100644 ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-ref.yaml delete mode 100644 ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.metadata.json delete mode 100644 ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-ref.yaml diff --git a/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml index 9cf32f8f33aca..0d3b1bb8d74bf 100644 --- a/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml @@ -4,11 +4,11 @@ workflow: pre: - chain: ipi-conf-azure - ref: ipi-conf-azure-ultrassd - - ref: storage-conf-storageclass-pre-set-default-azure-disk-ultrassd - chain: azure-provision-service-principal-minimal-permission - ref: rhcos-conf-osstream - chain: ipi-install - ref: ipi-azure-rbac + - ref: storage-conf-storageclass-add-azure-disk-ultrassd - ref: storage-conf-csi-azure-disk - ref: storage-conf-wait-for-csi-driver - ref: storage-obj-save @@ -28,5 +28,5 @@ workflow: documentation: |- The Openshift E2E Azure CSI UltraSSD workflow executes the openshift/csi end-to-end test suite on Azure Disk CSI driver with UltraSSD capability enabled and an UltraSSD_LRS - StorageClass set as default. This is required for VolumeAttributesClass tests which only + StorageClass. This is required for VolumeAttributesClass tests which only work with UltraSSD_LRS or PremiumV2_LRS disk types. diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/OWNERS b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/OWNERS similarity index 100% rename from ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/OWNERS rename to ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/OWNERS diff --git a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh similarity index 85% rename from ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh rename to ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh index d84e68011ed16..021396d04ac10 100644 --- a/ci-operator/step-registry/storage/conf/storageclass/pre-set-default-azure-disk-ultrassd/storage-conf-storageclass-pre-set-default-azure-disk-ultrassd-commands.sh +++ b/ci-operator/step-registry/storage/conf/storageclass/add-azure-disk-ultrassd/storage-conf-storageclass-add-azure-disk-ultrassd-commands.sh @@ -3,7 +3,7 @@ set -o errexit set -o nounset set -o pipefail -cat << EOF > ${SHARED_DIR}/manifest_storageclass.yaml +oc apply -f - <