Merge pull request red-hat-storage#409 from iamniting/version

update deps bundle images versions
iamniting · May 17, 2024 · 6fc935b · 6fc935b
2 parents b57244f + f69d8da
commit 6fc935b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -29,13 +29,13 @@ data:
   OCS_SUBSCRIPTION_CHANNEL: alpha
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
-  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.16.0
+  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.17.0
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   PROMETHEUS_SUBSCRIPTION_CHANNEL: beta
   PROMETHEUS_SUBSCRIPTION_NAME: odf-prometheus-operator
   PROMETHEUS_SUBSCRIPTION_PACKAGE: odf-prometheus-operator
-  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.16.0
+  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.17.0
   RECIPE_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   RECIPE_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   RECIPE_SUBSCRIPTION_CHANNEL: alpha

diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -2,7 +2,7 @@ dependencies:
 - type: olm.package
   value:
     packageName: ocs-operator
-    version: ">=4.15.0 <=4.16.0"
+    version: ">=4.16.0 <=4.17.0"
 - type: olm.package
   value:
     packageName: rook-ceph-operator
@@ -22,7 +22,7 @@ dependencies:
 - type: olm.package
   value:
     packageName: odf-prometheus-operator
-    version: ">=4.15.0 <=4.16.0"
+    version: ">=4.16.0 <=4.17.0"
 - type: olm.package
   value:
     packageName: recipe

diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -18,7 +18,7 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
-  - name: ocs-operator.v4.16.0
+  - name: ocs-operator.v4.17.0
 
 ---
 defaultChannel: alpha
@@ -84,7 +84,7 @@ schema: olm.channel
 package: odf-prometheus-operator
 name: beta
 entries:
-  - name: odf-prometheus-operator.v4.16.0
+  - name: odf-prometheus-operator.v4.17.0
 
 ---
 defaultChannel: alpha

diff --git a/catalog/ocs.yaml b/catalog/ocs.yaml
diff --git a/catalog/prometheus.yaml b/catalog/prometheus.yaml
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -13,7 +13,7 @@ CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 OCS_SUBSCRIPTION_NAME=ocs-operator
 OCS_SUBSCRIPTION_PACKAGE=ocs-operator
 OCS_SUBSCRIPTION_CHANNEL=alpha
-OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.16.0
+OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.17.0
 OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 OCS_CLIENT_SUBSCRIPTION_NAME=ocs-client-operator
@@ -37,7 +37,7 @@ ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 PROMETHEUS_SUBSCRIPTION_NAME=odf-prometheus-operator
 PROMETHEUS_SUBSCRIPTION_PACKAGE=odf-prometheus-operator
 PROMETHEUS_SUBSCRIPTION_CHANNEL=beta
-PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.16.0
+PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.17.0
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 RECIPE_SUBSCRIPTION_NAME=recipe

diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -34,7 +34,7 @@ var (
 		"OCS_SUBSCRIPTION_NAME":                    "ocs-operator",
 		"OCS_SUBSCRIPTION_PACKAGE":                 "ocs-operator",
 		"OCS_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"OCS_SUBSCRIPTION_STARTINGCSV":             "ocs-operator.v4.16.0",
+		"OCS_SUBSCRIPTION_STARTINGCSV":             "ocs-operator.v4.17.0",
 		"OCS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
@@ -69,7 +69,7 @@ var (
 		"PROMETHEUS_SUBSCRIPTION_NAME":                    "odf-prometheus-operator",
 		"PROMETHEUS_SUBSCRIPTION_PACKAGE":                 "odf-prometheus-operator",
 		"PROMETHEUS_SUBSCRIPTION_CHANNEL":                 "beta",
-		"PROMETHEUS_SUBSCRIPTION_STARTINGCSV":             "odf-prometheus-operator.v4.16.0",
+		"PROMETHEUS_SUBSCRIPTION_STARTINGCSV":             "odf-prometheus-operator.v4.17.0",
 		"PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -73,8 +73,8 @@ CRD_OPTIONS ?= "crd"
 
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
-OCS_BUNDLE_VERSION ?= v4.16.0
-OCS_BUNDLE_IMG_TAG ?= release-4.16-b1d5c27
+OCS_BUNDLE_VERSION ?= v4.17.0
+OCS_BUNDLE_IMG_TAG ?= main-34fff28
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)
 
@@ -121,8 +121,8 @@ ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BU
 # To be changed when odf-prometheus-operator bundle exists
 PROMETHEUS_BUNDLE_NAME ?= odf-prometheus-operator
 PROMETHEUS_BUNDLE_IMG_NAME ?= $(PROMETHEUS_BUNDLE_NAME)-bundle
-PROMETHEUS_BUNDLE_VERSION ?= v4.16.0
-PROMETHEUS_BUNDLE_IMG_TAG ?= main-d5fbc29
+PROMETHEUS_BUNDLE_VERSION ?= v4.17.0
+PROMETHEUS_BUNDLE_IMG_TAG ?= main-d82716f
 PROMETHEUS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_IMG_NAME):$(PROMETHEUS_BUNDLE_IMG_TAG)