Merge pull request #599 from subhamkrai/add-all-the-csi-env

Add all the csi env
red-hat-storage · Mar 25, 2024 · 5afe4a0 · 5afe4a0
2 parents 0395b58 + 0382944
commit 5afe4a0
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 14 deletions.
diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
@@ -1862,13 +1862,6 @@ metadata:
       IGRhdGE6IHtvc0Vycn0iKQogICAgZmluYWxseToKICAgICAgICByak9iai5zaHV0ZG93bigpCg==
   name: rook-ceph-operator.v4.15.0
   namespace: placeholder
-  relatedImages:
-    - image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
-      name: rook-container
-    - image: quay.io/ceph/ceph:v18.2.0
-      name: ceph-container
-    - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
-      name: csiaddons-sidecar
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
@@ -2970,6 +2963,18 @@ spec:
                         value: "true"
                       - name: ROOK_CSIADDONS_IMAGE
                         value: quay.io/csiaddons/k8s-sidecar:v0.8.0
+                      - name: ROOK_CSI_CEPH_IMAGE
+                        value: quay.io/cephcsi/cephcsi:v3.10.2
+                      - name: ROOK_CSI_REGISTRAR_IMAGE
+                        value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+                      - name: ROOK_CSI_RESIZER_IMAGE
+                        value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+                      - name: ROOK_CSI_PROVISIONER_IMAGE
+                        value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+                      - name: ROOK_CSI_SNAPSHOTTER_IMAGE
+                        value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+                      - name: ROOK_CSI_ATTACHER_IMAGE
+                        value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
                       - name: ROOK_OBC_PROVISIONER_NAME_PREFIX
                         value: openshift-storage
                       - name: CSI_ENABLE_METADATA
@@ -3386,3 +3391,20 @@ spec:
     url: https://your.domain
   version: 4.15.0
   minKubeVersion: 1.16.0
+  relatedImages:
+    - image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
+      name: rook-container
+    - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
+      name: csiaddons-sidecar
+    - image: quay.io/cephcsi/cephcsi:v3.10.2
+      name: ceph-csi
+    - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+      name: csi-node-driver-registrar
+    - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+      name: csi-resizer
+    - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+      name: csi-provisioner
+    - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+      name: csi-snapshotter
+    - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+      name: csi-attacher
diff --git a/build/csv/csv-gen.sh b/build/csv/csv-gen.sh
@@ -20,6 +20,22 @@ CEPH_EXTERNAL_SCRIPT_FILE="../../deploy/examples/create-external-cluster-resourc
 ASSEMBLE_FILE_COMMON="../../deploy/olm/assemble/metadata-common.yaml"
 ASSEMBLE_FILE_OCP="../../deploy/olm/assemble/metadata-ocp.yaml"
 
+LATEST_ROOK_CSI_CEPH_IMAGE="quay.io/cephcsi/cephcsi:v3.10.2"
+LATEST_ROOK_CSI_REGISTRAR_IMAGE="registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0"
+LATEST_ROOK_CSI_RESIZER_IMAGE="registry.k8s.io/sig-storage/csi-resizer:v1.10.0"
+LATEST_ROOK_CSI_PROVISIONER_IMAGE="registry.k8s.io/sig-storage/csi-provisioner:v4.0.0"
+LATEST_ROOK_CSI_SNAPSHOTTER_IMAGE="registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1"
+LATEST_ROOK_CSI_ATTACHER_IMAGE="registry.k8s.io/sig-storage/csi-attacher:v4.5.0"
+LATEST_ROOK_CSIADDONS_IMAGE="quay.io/csiaddons/k8s-sidecar:v0.8.0"
+
+ROOK_CSI_CEPH_IMAGE=${ROOK_CSI_CEPH_IMAGE:-${LATEST_ROOK_CSI_CEPH_IMAGE}}
+ROOK_CSI_REGISTRAR_IMAGE=${ROOK_CSI_REGISTRAR_IMAGE:-${LATEST_ROOK_CSI_REGISTRAR_IMAGE}}
+ROOK_CSI_RESIZER_IMAGE=${ROOK_CSI_RESIZER_IMAGE:-${LATEST_ROOK_CSI_RESIZER_IMAGE}}
+ROOK_CSI_PROVISIONER_IMAGE=${ROOK_CSI_PROVISIONER_IMAGE:-${LATEST_ROOK_CSI_PROVISIONER_IMAGE}}
+ROOK_CSI_SNAPSHOTTER_IMAGE=${ROOK_CSI_SNAPSHOTTER_IMAGE:-${LATEST_ROOK_CSI_SNAPSHOTTER_IMAGE}}
+ROOK_CSI_ATTACHER_IMAGE=${ROOK_CSI_ATTACHER_IMAGE:-${LATEST_ROOK_CSI_ATTACHER_IMAGE}}
+ROOK_CSIADDONS_IMAGE=${ROOK_CSIADDONS_IMAGE:-${LATEST_ROOK_CSIADDONS_IMAGE}}
+
 #############
 # FUNCTIONS #
 #############
@@ -54,6 +70,15 @@ function generate_csv() {
     sed -i "s/name: rook-ceph.v.*/name: rook-ceph-operator.v$CSV_VERSION/g" "$CSV_FILE_NAME"
     sed -i "s/version: 0.0.0/version: $CSV_VERSION/g" "$CSV_FILE_NAME"
 
+    # Update the csi version according to the downstream build env change
+    sed -i "s|$LATEST_ROOK_CSI_CEPH_IMAGE|$ROOK_CSI_CEPH_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSI_REGISTRAR_IMAGE|$ROOK_CSI_REGISTRAR_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSI_RESIZER_IMAGE|$ROOK_CSI_RESIZER_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSI_PROVISIONER_IMAGE|$ROOK_CSI_PROVISIONER_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSI_SNAPSHOTTER_IMAGE|$ROOK_CSI_SNAPSHOTTER_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSI_ATTACHER_IMAGE|$ROOK_CSI_ATTACHER_IMAGE|g" "$CSV_FILE_NAME"
+    sed -i "s|$LATEST_ROOK_CSIADDONS_IMAGE|$ROOK_CSIADDONS_IMAGE|g" "$CSV_FILE_NAME"
+
     mv "../../build/csv/ceph/$PLATFORM/manifests/"* "../../build/csv/ceph/"
     rm -rf "../../build/csv/ceph/$PLATFORM"
 }

diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml
@@ -719,6 +719,18 @@ spec:
               value: "true"
             - name: ROOK_CSIADDONS_IMAGE
               value: quay.io/csiaddons/k8s-sidecar:v0.8.0
+            - name: ROOK_CSI_CEPH_IMAGE
+              value: quay.io/cephcsi/cephcsi:v3.10.2
+            - name: ROOK_CSI_REGISTRAR_IMAGE
+              value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+            - name: ROOK_CSI_RESIZER_IMAGE
+              value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+            - name: ROOK_CSI_PROVISIONER_IMAGE
+              value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+            - name: ROOK_CSI_SNAPSHOTTER_IMAGE
+              value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+            - name: ROOK_CSI_ATTACHER_IMAGE
+              value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
             - name: ROOK_OBC_PROVISIONER_NAME_PREFIX
               value: openshift-storage
             - name: CSI_ENABLE_METADATA

diff --git a/deploy/olm/assemble/metadata-common.yaml b/deploy/olm/assemble/metadata-common.yaml
@@ -228,6 +228,23 @@ spec:
       supported: false
     - type: AllNamespaces
       supported: false
+  relatedImages:
+    - image: rook/ceph:master
+      name: rook-container
+    - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
+      name: csiaddons-sidecar
+    - image: quay.io/cephcsi/cephcsi:v3.10.2
+      name: ceph-csi
+    - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+      name: csi-node-driver-registrar
+    - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+      name: csi-resizer
+    - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+      name: csi-provisioner
+    - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+      name: csi-snapshotter
+    - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+      name: csi-attacher
 
 metadata:
   annotations:
@@ -428,10 +445,3 @@ metadata:
           }
         }
       ]
-  relatedImages:
-    - image: rook/ceph:master
-      name: rook-container
-    - image: quay.io/ceph/ceph:v18.2.0
-      name: ceph-container
-    - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
-      name: csiaddons-sidecar