From bfa3d9313137e6038da384200a9240d611755004 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Fri, 22 Mar 2024 18:29:09 +0530 Subject: [PATCH] controllers: add Prometheus csv in the csv list Signed-off-by: Nitin Goyal --- controllers/subscriptions.go | 2 +- hack/make-bundle-vars.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/subscriptions.go b/controllers/subscriptions.go index e1b74275d..1d998f666 100644 --- a/controllers/subscriptions.go +++ b/controllers/subscriptions.go @@ -224,7 +224,7 @@ func GetVendorCsvNames(kind odfv1alpha1.StorageKind) []string { csvNames = []string{IbmSubscriptionStartingCSV} } else if kind == VendorStorageCluster() { csvNames = []string{OcsSubscriptionStartingCSV, RookSubscriptionStartingCSV, NoobaaSubscriptionStartingCSV, - CSIAddonsSubscriptionStartingCSV, OcsClientSubscriptionStartingCSV} + CSIAddonsSubscriptionStartingCSV, OcsClientSubscriptionStartingCSV, PrometheusSubscriptionStartingCSV} } return csvNames diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index f1922239a..3bed36f69 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -117,7 +117,7 @@ PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_I # A space-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0 example.com/operator-bundle:v0.2.0). # These images MUST exist in a registry and be pull-able. -BUNDLE_IMGS ?= $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(OCS_CLIENT_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) $(CSIADDONS_BUNDLE_IMG) $(ROOK_BUNDLE_IMG) +BUNDLE_IMGS ?= $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(OCS_CLIENT_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) $(CSIADDONS_BUNDLE_IMG) $(ROOK_BUNDLE_IMG) $(PROMETHEUS_BUNDLE_IMG) # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image. ifneq ($(origin CATALOG_BASE_IMG), undefined)