Merge pull request red-hat-storage#1697 from malayparida2000/fix_metr…

…ic_exporter Change ocs-metrics-exporter to use the correct image name
pdvian · May 26, 2022 · 98d2b32 · 98d2b32
2 parents a9bc7ae + e6d6752
commit 98d2b32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deploy/bundle/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/bundle/manifests/ocs-operator.clusterserviceversion.yaml
@@ -2779,7 +2779,7 @@ spec:
                 - --namespaces=openshift-storage
                 command:
                 - /usr/local/bin/metrics-exporter
-                image: quay.io/ocs-dev/ocs-operator:latest
+                image: quay.io/ocs-dev/ocs-metrics-exporter:latest
                 name: ocs-metrics-exporter
                 ports:
                 - containerPort: 8080
@@ -3083,6 +3083,6 @@ spec:
     name: rook-csi-nfs
   - image: quay.io/ocs-dev/ocs-must-gather:latest
     name: ocs-must-gather
-  - image: quay.io/ocs-dev/ocs-operator:latest
+  - image: quay.io/ocs-dev/ocs-metrics-exporter:latest
     name: ocs-metrics-exporter
   version: 4.11.0
diff --git a/hack/generate-latest-csv.sh b/hack/generate-latest-csv.sh
@@ -18,7 +18,7 @@ export OCS_MUST_GATHER_IMAGE=${OCS_MUST_GATHER_IMAGE:-"${MUST_GATHER_FULL_IMAGE_
 export VOLUME_REPLICATION_OPERATOR_IMAGE=${VOLUME_REPLICATION_OPERATOR_IMAGE:-"${IMAGE_REGISTRY}/${LATEST_VOLUME_REPLICATION_OPERATOR_IMAGE}"}
 export ROOK_CSIADDONS_IMAGE=${ROOK_CSIADDONS_IMAGE:-"${IMAGE_REGISTRY}/${LATEST_ROOK_CSIADDONS_IMAGE}"}
 export ROOK_CSI_NFS_IMAGE=${ROOK_CSI_NFS_IMAGE:-${LATEST_ROOK_CSI_NFS_IMAGE}}
-export OCS_METRICS_EXPORTER_IMAGE=${OCS_METRICS_EXPORTER_IMAGE:-"${OCS_IMAGE}"}
+export OCS_METRICS_EXPORTER_IMAGE=${OCS_METRICS_EXPORTER_IMAGE:-"${IMAGE_REGISTRY}/${REGISTRY_NAMESPACE}/${METRICS_EXPORTER_IMAGE_NAME}:${IMAGE_TAG}"}
 
 echo "=== Generating DEV CSV with the following vars ==="
 echo -e "\tCSV_VERSION=$CSV_VERSION"