Add code to override control-plane driver image for azure-disk

openshift · Nov 29, 2023 · 13c480c · 13c480c
1 parent 69471f7
commit 13c480c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ $(call build-image,cluster-storage-operator,$(IMAGE_REGISTRY)/ocp/4.6:cluster-st
 # $3 - manifests directory
 $(call add-profile-manifests,manifests,./profile-patches,./manifests)
 
-update: generate-kustomize-manifests
+update: generate-kustomize-manifests update-generated
 
 generate-kustomize-manifests:
 	./hack/generate-manifests.sh

diff --git a/manifests/10_deployment-hypershift.yaml b/manifests/10_deployment-hypershift.yaml
@@ -106,12 +106,12 @@ spec:
           value: quay.io/openshift/origin-powervs-block-csi-driver:latest
         - name: HYPERSHIFT_IMAGE
           value: quay.io/openshift/origin-control-plane:latest
-        - name: AZURE_DISK_DRIVER_CONTROL_PLANE_IMAGE
-          value: quay.io/openshift/origin-azure-disk-csi-driver-operator:latest
-        - name: LIVENESS_PROBE_CONTROL_PLANE_IMAGE
-          value: quay.io/openshift/origin-csi-livenessprobe:latest
         - name: AWS_EBS_DRIVER_CONTROL_PLANE_IMAGE
           value: quay.io/openshift/origin-aws-ebs-csi-driver:latest
+        - name: LIVENESS_PROBE_CONTROL_PLANE_IMAGE
+          value: quay.io/openshift/origin-csi-livenessprobe:latest
+        - name: AZURE_DISK_DRIVER_CONTROL_PLANE_IMAGE
+          value: quay.io/openshift/origin-azure-disk-csi-driver-operator:latest
         image: quay.io/openshift/origin-cluster-storage-operator:latest
         imagePullPolicy: IfNotPresent
         name: cluster-storage-operator

diff --git a/profile-patches/hypershift/10_deployment.yaml-patch b/profile-patches/hypershift/10_deployment.yaml-patch
@@ -42,7 +42,7 @@
     name: AWS_EBS_DRIVER_CONTROL_PLANE_IMAGE
     value: quay.io/openshift/origin-aws-ebs-csi-driver:latest
 - op: add
-  path: /spec/template/spec/containers/0/env/40
+  path: /spec/template/spec/containers/0/env/41
   value:
     name: AZURE_DISK_DRIVER_CONTROL_PLANE_IMAGE
     value: quay.io/openshift/origin-azure-disk-csi-driver-operator:latest