Merge pull request #718 from Nikhil-Ladha/fix-csv-gen-script

Fix csv-gen script to correctly replace ROOK_IMAGE env var
red-hat-storage · Sep 4, 2024 · 8ca102a · 8ca102a
2 parents ddb3050 + 6252eb0
commit 8ca102a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -32,7 +32,7 @@ DEFAULT_CSV_VERSION="4.17.0"
 CSV_VERSION="${CSV_VERSION:-${DEFAULT_CSV_VERSION}}"
 SKIP_RANGE="${SKIP_RANGE:-""}"
 REPLACES_CSV_VERSION="${REPLACES_CSV_VERSION:-""}"
-LATEST_ROOK_IMAGE="docker.io/rook/ceph:v1.13.0.399.g9c0d795e2"
+LATEST_ROOK_IMAGE="docker.io/rook/ceph:v1.15.0.133.g04eecf7ab"
 ROOK_IMAGE=${ROOK_IMAGE:-${LATEST_ROOK_IMAGE}}
 DEFAULT_BUNDLE_IMAGE=quay.io/ocs-dev/rook-ceph-operator-bundle:"${VERSION}"
 BUNDLE_IMAGE="${BUNDLE_IMAGE:-${DEFAULT_BUNDLE_IMAGE}}"

diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
@@ -201,7 +201,7 @@ metadata:
     operators.operatorframework.io/project_layout: unknown
     tectonic-visibility: ocs
     repository: https://github.com/red-hat-storage/rook
-    containerImage: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
+    containerImage: docker.io/rook/ceph:v1.15.0.133.g04eecf7ab
     operators.operatorframework.io/operator-type: non-standalone
     externalClusterScript: |-
       IiIiCkNvcHlyaWdodCAyMDIwIFRoZSBSb29rIEF1dGhvcnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
@@ -3163,7 +3163,7 @@ spec:
                             fieldPath: metadata.namespace
                       - name: ROOK_OBC_WATCH_OPERATOR_NAMESPACE
                         value: "true"
-                    image: docker.io/rook/ceph:master
+                    image: docker.io/rook/ceph:v1.15.0.133.g04eecf7ab
                     name: rook-ceph-operator
                     resources: {}
                     securityContext:
@@ -3506,7 +3506,7 @@ spec:
   version: 4.17.0
   minKubeVersion: 1.16.0
   relatedImages:
-    - image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
+    - image: docker.io/rook/ceph:v1.15.0.133.g04eecf7ab
       name: rook-container
     - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
       name: csiaddons-sidecar

diff --git a/build/csv/csv-gen.sh b/build/csv/csv-gen.sh
@@ -73,8 +73,8 @@ function generate_csv() {
         return
     fi
 
-    sed -i "s|containerImage: rook/ceph:.*|containerImage: $ROOK_IMAGE|" "$CSV_FILE_NAME"
-    sed -i "s|image: rook/ceph:.*|image: $ROOK_IMAGE|" "$CSV_FILE_NAME"
+    sed -i "s|containerImage: .*/rook/ceph:.*|containerImage: $ROOK_IMAGE|" "$CSV_FILE_NAME"
+    sed -i "s|image: .*/rook/ceph:.*|image: $ROOK_IMAGE|" "$CSV_FILE_NAME"
     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"
 

diff --git a/deploy/olm/assemble/metadata-common.yaml b/deploy/olm/assemble/metadata-common.yaml
@@ -232,7 +232,7 @@ spec:
     - type: AllNamespaces
       supported: false
   relatedImages:
-    - image: rook/ceph:master
+    - image: docker.io/rook/ceph:master
       name: rook-container
     - image: quay.io/csiaddons/k8s-sidecar:v0.8.0
       name: csiaddons-sidecar
@@ -254,7 +254,7 @@ metadata:
     capabilities: Seamless Upgrades
     tectonic-visibility: ocs
     repository: https://github.com/red-hat-storage/rook
-    containerImage: rook/ceph:master
+    containerImage: docker.io/rook/ceph:master
     operators.operatorframework.io/operator-type: non-standalone
     alm-examples: |-
       [