Merge pull request #598 from red-hat-storage/add-rook-image-env-variable

build: export ROOK_IMAGE env variable
red-hat-storage · Mar 22, 2024 · 0395b58 · 0395b58
2 parents 3636f1d + 1398c5a
commit 0395b58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -30,7 +30,8 @@ export GOARCH
 GOARCH=$(go env GOARCH)
 DEFAULT_CSV_VERSION="4.15.0"
 CSV_VERSION="${CSV_VERSION:-${DEFAULT_CSV_VERSION}}"
-export ROOK_IMAGE="docker.io/rook/ceph:v1.13.0.399.g9c0d795e2"
+LATEST_ROOK_IMAGE="docker.io/rook/ceph:v1.13.0.399.g9c0d795e2"
+ROOK_IMAGE=${ROOK_IMAGE:-${LATEST_ROOK_IMAGE}}
 DEFAULT_BUNDLE_IMAGE=rook/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
@@ -1863,7 +1863,7 @@ metadata:
   name: rook-ceph-operator.v4.15.0
   namespace: placeholder
   relatedImages:
-    - image: docker.io/rook/ceph:master
+    - image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2
       name: rook-container
     - image: quay.io/ceph/ceph:v18.2.0
       name: ceph-container

diff --git a/deploy/olm/assemble/metadata-common.yaml b/deploy/olm/assemble/metadata-common.yaml
@@ -429,7 +429,7 @@ metadata:
         }
       ]
   relatedImages:
-    - image: docker.io/rook/ceph:master
+    - image: rook/ceph:master
       name: rook-container
     - image: quay.io/ceph/ceph:v18.2.0
       name: ceph-container