From 264a16c70a1ad489120edbd98225cbbcdcf8ee9f Mon Sep 17 00:00:00 2001 From: Nikhil-Ladha Date: Fri, 22 Mar 2024 17:19:06 +0530 Subject: [PATCH] remove rook related env variables from ocs-operator remove rook related env variables from ocs-operator Signed-off-by: Nikhil-Ladha --- docs/catalog-generation.md | 6 ----- hack/generate-unified-csv.sh | 12 ---------- tools/csv-merger/csv-merger.go | 42 ---------------------------------- 3 files changed, 60 deletions(-) diff --git a/docs/catalog-generation.md b/docs/catalog-generation.md index 682836dbe8..b4ce20fe8c 100644 --- 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= $ export OCS_IMAGE= -$ export ROOK_CSI_CEPH_IMAGE= -$ export ROOK_CSI_REGISTRAR_IMAGE= -$ export ROOK_CSI_RESIZER_IMAGE= -$ export ROOK_CSI_PROVISIONER_IMAGE= -$ export ROOK_CSI_SNAPSHOTTER_IMAGE= -$ export ROOK_CSI_ATTACHER_IMAGE= $ make gen-release-csv ``` diff --git a/hack/generate-unified-csv.sh b/hack/generate-unified-csv.sh index 84387a781c..52b6ee8696 100755 --- 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= CSV_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 index c2245c13b9..18e217bca1 100644 --- 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") @@ -512,42 +506,6 @@ func injectCSVRelatedImages(r *unstructured.Unstructured) error { "image": *cephContainerImage, }) } - if *rookCsiCephImage != "" { - relatedImages = append(relatedImages, map[string]interface{}{ - "name": "rook-csi", - "image": *rookCsiCephImage, - }) - } - if *rookCsiRegistrarImage != "" { - 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, - }) - } if *ocsMustGatherImage != "" { relatedImages = append(relatedImages, map[string]interface{}{ "name": "ocs-must-gather",