Merge pull request #2522 from Nikhil-Ladha/add-ceph-image

Add rook,ceph image and remove rook related env variables from relatedImages field in csv
red-hat-storage · Mar 22, 2024 · 9d4d892 · 9d4d892
2 parents 18d5246 + 6978c9b
commit 9d4d892
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 54 deletions.
diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
@@ -726,6 +726,10 @@ spec:
   provider:
     name: Red Hat
   relatedImages:
+  - image: quay.io/ocs-dev/rook-ceph:latest-downstream
+    name: rook-container
+  - image: quay.io/ceph/ceph:v18.2.0
+    name: ceph-container
   - image: quay.io/ocs-dev/ocs-must-gather:latest
     name: ocs-must-gather
   - image: quay.io/ocs-dev/ocs-metrics-exporter:latest

diff --git a/docs/catalog-generation.md b/docs/catalog-generation.md
@@ -38,12 +38,6 @@ $ export CSV_VERSION=0.0.2
 $ export REPLACES_CSV_VERSION=0.0.1
 $ export ROOK_IMAGE=<add rook image url here>
 $ export OCS_IMAGE=<add ocs operator image url here>
-$ export ROOK_CSI_CEPH_IMAGE=<add image here>
-$ export ROOK_CSI_REGISTRAR_IMAGE=<add image here>
-$ export ROOK_CSI_RESIZER_IMAGE=<add image here>
-$ export ROOK_CSI_PROVISIONER_IMAGE=<add image here>
-$ export ROOK_CSI_SNAPSHOTTER_IMAGE=<add image here>
-$ export ROOK_CSI_ATTACHER_IMAGE=<add image here>
 
 $ make gen-release-csv
 ```

diff --git a/hack/generate-unified-csv.sh b/hack/generate-unified-csv.sh
@@ -19,12 +19,6 @@ function help_txt() {
 	echo "    CSV_VERSION:          (required) The ocs-operator csv version that will be generated"
 	echo "    REPLACES_CSV_VERSION       (optional) The ocs-operator csv version this new csv will be updating"
 	echo "    SKIP_RANGE                 (optional) The skip range value set for this csv"
-	echo "    ROOK_CSI_CEPH_IMAGE        (optional) Sets custom image env var on the rook deployment spec"
-	echo "    ROOK_CSI_REGISTRAR_IMAGE   (optional) Sets custom image env var on the rook deployment spec"
-	echo "    ROOK_CSI_RESIZER_IMAGE     (optional) Sets custom image env var on the rook deployment spec"
-	echo "    ROOK_CSI_PROVISIONER_IMAGE (optional) Sets custom image env var on the rook deployment spec"
-	echo "    ROOK_CSI_SNAPSHOTTER_IMAGE (optional) Sets custom image env var on the rook deployment spec"
-	echo "    ROOK_CSI_ATTACHER_IMAGE    (optional) Sets custom image env var on the rook deployment spec"
 	echo ""
 	echo "Example usage:"
 	echo "    ROOK_IMAGE=<image> CSV_VERSION=<version> $0"
@@ -50,12 +44,6 @@ $CSV_MERGER \
 	--ocs-csv-filepath=$OCS_CSV \
 	--rook-image="$ROOK_IMAGE" \
 	--ceph-image="$CEPH_IMAGE" \
-	--rook-csi-ceph-image="$ROOK_CSI_CEPH_IMAGE" \
-	--rook-csi-registrar-image="$ROOK_CSI_REGISTRAR_IMAGE" \
-	--rook-csi-resizer-image="$ROOK_CSI_RESIZER_IMAGE" \
-	--rook-csi-provisioner-image="$ROOK_CSI_PROVISIONER_IMAGE" \
-	--rook-csi-snapshotter-image="$ROOK_CSI_SNAPSHOTTER_IMAGE" \
-	--rook-csi-attacher-image="$ROOK_CSI_ATTACHER_IMAGE" \
 	--noobaa-core-image="$NOOBAA_CORE_IMAGE" \
 	--noobaa-db-image="$NOOBAA_DB_IMAGE" \
 	--ocs-image="$OCS_IMAGE" \

diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go
@@ -35,12 +35,6 @@ var (
 
 	rookContainerImage       = flag.String("rook-image", "", "rook operator container image")
 	cephContainerImage       = flag.String("ceph-image", "", "ceph daemon container image")
-	rookCsiCephImage         = flag.String("rook-csi-ceph-image", "", "optional - defaults version supported by rook will be started if this is not set.")
-	rookCsiRegistrarImage    = flag.String("rook-csi-registrar-image", "", "optional - defaults version supported by rook will be started if this is not set.")
-	rookCsiResizerImage      = flag.String("rook-csi-resizer-image", "", "optional - defaults version supported by rook will be started if this is not set.")
-	rookCsiProvisionerImage  = flag.String("rook-csi-provisioner-image", "", "optional - defaults version supported by rook will be started if this is not set.")
-	rookCsiSnapshotterImage  = flag.String("rook-csi-snapshotter-image", "", "optional - defaults version supported by rook will be started if this is not set.")
-	rookCsiAttacherImage     = flag.String("rook-csi-attacher-image", "", "optional - defaults version supported by rook will be started if this is not set.")
 	noobaaCoreContainerImage = flag.String("noobaa-core-image", "", "noobaa core container image")
 	noobaaDBContainerImage   = flag.String("noobaa-db-image", "", "db container image for noobaa")
 	ocsContainerImage        = flag.String("ocs-image", "", "ocs operator container image")
@@ -500,40 +494,16 @@ func injectCSVRelatedImages(r *unstructured.Unstructured) error {
 
 	relatedImages := []interface{}{}
 
-	if *rookCsiCephImage != "" {
+	if *rookContainerImage != "" {
 		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi",
-			"image": *rookCsiCephImage,
+			"name":  "rook-container",
+			"image": *rookContainerImage,
 		})
 	}
-	if *rookCsiRegistrarImage != "" {
+	if *cephContainerImage != "" {
 		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi-registrar",
-			"image": *rookCsiRegistrarImage,
-		})
-	}
-	if *rookCsiResizerImage != "" {
-		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi-resizer",
-			"image": *rookCsiResizerImage,
-		})
-	}
-	if *rookCsiProvisionerImage != "" {
-		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi-provisioner",
-			"image": *rookCsiProvisionerImage,
-		})
-	}
-	if *rookCsiSnapshotterImage != "" {
-		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi-snapshotter",
-			"image": *rookCsiSnapshotterImage,
-		})
-	}
-	if *rookCsiAttacherImage != "" {
-		relatedImages = append(relatedImages, map[string]interface{}{
-			"name":  "rook-csi-attacher",
-			"image": *rookCsiAttacherImage,
+			"name":  "ceph-container",
+			"image": *cephContainerImage,
 		})
 	}
 	if *ocsMustGatherImage != "" {