Merge pull request #392 from iamniting/ver

update child operator versions
red-hat-storage · Apr 1, 2024 · 36a1b6e · 36a1b6e
2 parents b978f4f + a048dd2
commit 36a1b6e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -5,7 +5,7 @@ data:
   CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
   CSIADDONS_SUBSCRIPTION_NAME: csi-addons
   CSIADDONS_SUBSCRIPTION_PACKAGE: csi-addons
-  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.7.0
+  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.8.0
   IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   IBM_SUBSCRIPTION_CHANNEL: stable-v1.4
@@ -23,7 +23,7 @@ data:
   OCS_CLIENT_SUBSCRIPTION_CHANNEL: alpha
   OCS_CLIENT_SUBSCRIPTION_NAME: ocs-client-operator
   OCS_CLIENT_SUBSCRIPTION_PACKAGE: ocs-client-operator
-  OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.15.0
+  OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.16.0
   OCS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   OCS_SUBSCRIPTION_CHANNEL: alpha
@@ -35,13 +35,13 @@ data:
   PROMETHEUS_SUBSCRIPTION_CHANNEL: beta
   PROMETHEUS_SUBSCRIPTION_NAME: odf-prometheus-operator
   PROMETHEUS_SUBSCRIPTION_PACKAGE: odf-prometheus-operator
-  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.10.0
+  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.16.0
   ROOK_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   ROOK_SUBSCRIPTION_CHANNEL: alpha
   ROOK_SUBSCRIPTION_NAME: rook-ceph-operator
   ROOK_SUBSCRIPTION_PACKAGE: rook-ceph-operator
-  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.15.0
+  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.16.0
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
     kind: ControllerManagerConfig

diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -2,24 +2,24 @@ dependencies:
 - type: olm.package
   value:
     packageName: ocs-operator
-    version: ">=4.15.0 <4.16.0 || 4.16.0"
+    version: ">=4.15.0 <=4.16.0"
 - type: olm.package
   value:
     packageName: rook-ceph-operator
-    version: ">=4.14.0 <4.15.0 || 4.15.0"
+    version: ">=4.15.0 <=4.16.0"
 - type: olm.package
   value:
     packageName: ocs-client-operator
-    version: ">=4.14.0 <4.15.0 || 4.15.0"
+    version: ">=4.15.0 <=4.16.0"
 - type: olm.package
   value:
     packageName: noobaa-operator
     version: "5.14.0"
 - type: olm.package
   value:
     packageName: csi-addons
-    version: "0.7.0"
+    version: ">=0.7.0 <=0.8.0"
 - type: olm.package
   value:
     packageName: odf-prometheus-operator
-    version: "4.10.0"
+    version: ">=4.15.0 <=4.16.0"
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -29,7 +29,7 @@ schema: olm.channel
 package: ocs-client-operator
 name: alpha
 entries:
-  - name: ocs-client-operator.v4.15.0
+  - name: ocs-client-operator.v4.16.0
 
 ---
 defaultChannel: alpha
@@ -51,7 +51,7 @@ schema: olm.channel
 package: csi-addons
 name: alpha
 entries:
-  - name: csi-addons.v0.7.0
+  - name: csi-addons.v0.8.0
 
 ---
 defaultChannel: stable-v1.4
@@ -73,7 +73,7 @@ schema: olm.channel
 package: rook-ceph-operator
 name: alpha
 entries:
-  - name: rook-ceph-operator.v4.15.0
+  - name: rook-ceph-operator.v4.16.0
 
 ---
 defaultChannel: beta
@@ -84,4 +84,4 @@ schema: olm.channel
 package: odf-prometheus-operator
 name: beta
 entries:
-  - name: odf-prometheus-operator.v4.10.0
+  - name: odf-prometheus-operator.v4.16.0
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -7,7 +7,7 @@ NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 CSIADDONS_SUBSCRIPTION_NAME=csi-addons
 CSIADDONS_SUBSCRIPTION_PACKAGE=csi-addons
 CSIADDONS_SUBSCRIPTION_CHANNEL=alpha
-CSIADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.v0.7.0
+CSIADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.v0.8.0
 CSIADDONS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 OCS_SUBSCRIPTION_NAME=ocs-operator
@@ -19,7 +19,7 @@ OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 OCS_CLIENT_SUBSCRIPTION_NAME=ocs-client-operator
 OCS_CLIENT_SUBSCRIPTION_PACKAGE=ocs-client-operator
 OCS_CLIENT_SUBSCRIPTION_CHANNEL=alpha
-OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=ocs-client-operator.v4.15.0
+OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=ocs-client-operator.v4.16.0
 OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator
@@ -31,12 +31,12 @@ IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 ROOK_SUBSCRIPTION_NAME=rook-ceph-operator
 ROOK_SUBSCRIPTION_PACKAGE=rook-ceph-operator
 ROOK_SUBSCRIPTION_CHANNEL=alpha
-ROOK_SUBSCRIPTION_STARTINGCSV=rook-ceph-operator.v4.15.0
+ROOK_SUBSCRIPTION_STARTINGCSV=rook-ceph-operator.v4.16.0
 ROOK_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 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.10.0
+PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.16.0
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -41,14 +41,14 @@ var (
 		"OCS_CLIENT_SUBSCRIPTION_NAME":                    "ocs-client-operator",
 		"OCS_CLIENT_SUBSCRIPTION_PACKAGE":                 "ocs-client-operator",
 		"OCS_CLIENT_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"OCS_CLIENT_SUBSCRIPTION_STARTINGCSV":             "ocs-client-operator.v4.15.0",
+		"OCS_CLIENT_SUBSCRIPTION_STARTINGCSV":             "ocs-client-operator.v4.16.0",
 		"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
 		"CSIADDONS_SUBSCRIPTION_NAME":                    "csi-addons",
 		"CSIADDONS_SUBSCRIPTION_PACKAGE":                 "csi-addons",
 		"CSIADDONS_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"CSIADDONS_SUBSCRIPTION_STARTINGCSV":             "csi-addons.v0.7.0",
+		"CSIADDONS_SUBSCRIPTION_STARTINGCSV":             "csi-addons.v0.8.0",
 		"CSIADDONS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
@@ -62,14 +62,14 @@ var (
 		"ROOK_SUBSCRIPTION_NAME":                    "rook-ceph-operator",
 		"ROOK_SUBSCRIPTION_PACKAGE":                 "rook-ceph-operator",
 		"ROOK_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"ROOK_SUBSCRIPTION_STARTINGCSV":             "rook-ceph-operator.v4.15.0",
+		"ROOK_SUBSCRIPTION_STARTINGCSV":             "rook-ceph-operator.v4.16.0",
 		"ROOK_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"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.10.0",
+		"PROMETHEUS_SUBSCRIPTION_STARTINGCSV":             "odf-prometheus-operator.v4.16.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
@@ -70,14 +70,14 @@ 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 ?= v4.16.0
+OCS_BUNDLE_IMG_TAG ?= main-0c259e6
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)
 
 OCS_CLIENT_BUNDLE_NAME ?= ocs-client-operator
 OCS_CLIENT_BUNDLE_IMG_NAME ?= $(OCS_CLIENT_BUNDLE_NAME)-bundle
-OCS_CLIENT_BUNDLE_VERSION ?= v4.15.0
-OCS_CLIENT_BUNDLE_IMG_TAG ?= v4.15.0
+OCS_CLIENT_BUNDLE_VERSION ?= v4.16.0
+OCS_CLIENT_BUNDLE_IMG_TAG ?= main-a79f241-addons-080
 OCS_CLIENT_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_CLIENT_BUNDLE_IMG ?= $(OCS_CLIENT_BUNDLE_IMG_LOCATION)/$(OCS_CLIENT_BUNDLE_IMG_NAME):$(OCS_CLIENT_BUNDLE_IMG_TAG)
 
@@ -90,8 +90,8 @@ NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(N
 
 CSIADDONS_BUNDLE_NAME ?= csi-addons
 CSIADDONS_BUNDLE_IMG_NAME ?= k8s-bundle
-CSIADDONS_BUNDLE_VERSION ?= v0.7.0
-CSIADDONS_BUNDLE_IMG_TAG ?= v0.7.0
+CSIADDONS_BUNDLE_VERSION ?= v0.8.0
+CSIADDONS_BUNDLE_IMG_TAG ?= v0.8.0
 CSIADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons
 CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_NAME):$(CSIADDONS_BUNDLE_IMG_TAG)
 
@@ -109,16 +109,16 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON
 
 ROOK_BUNDLE_NAME ?= rook-ceph-operator
 ROOK_BUNDLE_IMG_NAME ?= $(ROOK_BUNDLE_NAME)-bundle
-ROOK_BUNDLE_VERSION ?= v4.15.0
-ROOK_BUNDLE_IMG_TAG ?= v4.15.0
+ROOK_BUNDLE_VERSION ?= v4.16.0
+ROOK_BUNDLE_IMG_TAG ?= master-9e5499216
 ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG)
 
 # 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.10.0
-PROMETHEUS_BUNDLE_IMG_TAG ?= v4.10.0
+PROMETHEUS_BUNDLE_VERSION ?= v4.16.0
+PROMETHEUS_BUNDLE_IMG_TAG ?= main-d5fbc29
 PROMETHEUS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_IMG_NAME):$(PROMETHEUS_BUNDLE_IMG_TAG)