Merge pull request #501 from iamniting/4.18

Update version to 4.18
red-hat-storage · Nov 13, 2024 · e24ff7a · e24ff7a
2 parents 1ad1323 + 5c30158
commit e24ff7a
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 116 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:
   CEPHCSI_SUBSCRIPTION_CHANNEL: alpha
   CEPHCSI_SUBSCRIPTION_NAME: cephcsi-operator
   CEPHCSI_SUBSCRIPTION_PACKAGE: cephcsi-operator
-  CEPHCSI_SUBSCRIPTION_STARTINGCSV: cephcsi-operator.v4.17.0
+  CEPHCSI_SUBSCRIPTION_STARTINGCSV: cephcsi-operator.v4.18.0
   CSIADDONS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
@@ -29,19 +29,19 @@ 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.17.0
+  OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.18.0
   OCS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   OCS_SUBSCRIPTION_CHANNEL: alpha
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
-  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.17.0
+  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.18.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.17.0
+  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.18.0
   RECIPE_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   RECIPE_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   RECIPE_SUBSCRIPTION_CHANNEL: alpha
@@ -53,7 +53,7 @@ data:
   ROOK_SUBSCRIPTION_CHANNEL: alpha
   ROOK_SUBSCRIPTION_NAME: rook-ceph-operator
   ROOK_SUBSCRIPTION_PACKAGE: rook-ceph-operator
-  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.17.0
+  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.18.0
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
     kind: ControllerManagerConfig

diff --git a/bundle/manifests/odf-operator.clusterserviceversion.yaml b/bundle/manifests/odf-operator.clusterserviceversion.yaml
@@ -35,11 +35,11 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-console"]'
     containerImage: quay.io/ocs-dev/odf-operator:latest
-    createdAt: "2024-09-12T08:48:15Z"
+    createdAt: "2024-11-13T13:01:04Z"
     description: OpenShift Data Foundation provides a common control plane for storage
       solutions on OpenShift Container Platform.
     features.operators.openshift.io/token-auth-aws: "true"
-    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.18"}]'
+    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
     olm.skipRange: ""
     operatorframework.io/initialization-resource: |-
       {
@@ -69,7 +69,7 @@ metadata:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: odf-operator.v4.17.0
+  name: odf-operator.v4.18.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -565,4 +565,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 4.17.0
+  version: 4.18.0
diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -2,15 +2,15 @@ dependencies:
 - type: olm.package
   value:
     packageName: ocs-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: rook-ceph-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: ocs-client-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: noobaa-operator
@@ -22,11 +22,11 @@ dependencies:
 - type: olm.package
   value:
     packageName: cephcsi-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: odf-prometheus-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: recipe

diff --git a/catalog/cephcsi.yaml b/catalog/cephcsi.yaml
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -7,7 +7,7 @@ schema: olm.channel
 package: odf-operator
 name: alpha
 entries:
-  - name: odf-operator.v4.17.0
+  - name: odf-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -18,7 +18,7 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
-  - name: ocs-operator.v4.17.0
+  - name: ocs-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -29,7 +29,7 @@ schema: olm.channel
 package: ocs-client-operator
 name: alpha
 entries:
-  - name: ocs-client-operator.v4.17.0
+  - name: ocs-client-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -62,7 +62,7 @@ schema: olm.channel
 package: cephcsi-operator
 name: alpha
 entries:
-  - name: cephcsi-operator.v4.17.0
+  - name: cephcsi-operator.v4.18.0
 
 ---
 defaultChannel: stable-v1.6
@@ -84,7 +84,7 @@ schema: olm.channel
 package: rook-ceph-operator
 name: alpha
 entries:
-  - name: rook-ceph-operator.v4.17.0
+  - name: rook-ceph-operator.v4.18.0
 
 ---
 defaultChannel: beta
@@ -95,7 +95,7 @@ schema: olm.channel
 package: odf-prometheus-operator
 name: beta
 entries:
-  - name: odf-prometheus-operator.v4.17.0
+  - name: odf-prometheus-operator.v4.18.0
 
 ---
 defaultChannel: alpha

diff --git a/catalog/noobaa.yaml b/catalog/noobaa.yaml
diff --git a/catalog/ocs-client.yaml b/catalog/ocs-client.yaml
diff --git a/catalog/ocs.yaml b/catalog/ocs.yaml
diff --git a/catalog/prometheus.yaml b/catalog/prometheus.yaml
diff --git a/catalog/rook.yaml b/catalog/rook.yaml
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -13,19 +13,19 @@ CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 CEPHCSI_SUBSCRIPTION_NAME=cephcsi-operator
 CEPHCSI_SUBSCRIPTION_PACKAGE=cephcsi-operator
 CEPHCSI_SUBSCRIPTION_CHANNEL=alpha
-CEPHCSI_SUBSCRIPTION_STARTINGCSV=cephcsi-operator.v4.17.0
+CEPHCSI_SUBSCRIPTION_STARTINGCSV=cephcsi-operator.v4.18.0
 CEPHCSI_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 CEPHCSI_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.17.0
+OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.18.0
 OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 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.17.0
+OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=ocs-client-operator.v4.18.0
 OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator
@@ -37,13 +37,13 @@ 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.17.0
+ROOK_SUBSCRIPTION_STARTINGCSV=rook-ceph-operator.v4.18.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.17.0
+PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.18.0
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 RECIPE_SUBSCRIPTION_NAME=recipe

diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml
@@ -6,7 +6,7 @@ patchesStrategicMerge:
 - odf-operator.csv.icon.yaml
 - odf-operator.csv.card-description.yaml
 commonAnnotations:
-  olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.18"}]'
+  olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
   olm.skipRange: ""
   operators.operatorframework.io/operator-type: standalone
 patches:

diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -34,14 +34,14 @@ var (
 		"OCS_SUBSCRIPTION_NAME":                    "ocs-operator",
 		"OCS_SUBSCRIPTION_PACKAGE":                 "ocs-operator",
 		"OCS_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"OCS_SUBSCRIPTION_STARTINGCSV":             "ocs-operator.v4.17.0",
+		"OCS_SUBSCRIPTION_STARTINGCSV":             "ocs-operator.v4.18.0",
 		"OCS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"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.17.0",
+		"OCS_CLIENT_SUBSCRIPTION_STARTINGCSV":             "ocs-client-operator.v4.18.0",
 		"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
@@ -55,7 +55,7 @@ var (
 		"CEPHCSI_SUBSCRIPTION_NAME":                    "cephcsi-operator",
 		"CEPHCSI_SUBSCRIPTION_PACKAGE":                 "cephcsi-operator",
 		"CEPHCSI_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"CEPHCSI_SUBSCRIPTION_STARTINGCSV":             "cephcsi-operator.v4.17.0",
+		"CEPHCSI_SUBSCRIPTION_STARTINGCSV":             "cephcsi-operator.v4.18.0",
 		"CEPHCSI_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"CEPHCSI_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
@@ -69,14 +69,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.17.0",
+		"ROOK_SUBSCRIPTION_STARTINGCSV":             "rook-ceph-operator.v4.18.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.17.0",
+		"PROMETHEUS_SUBSCRIPTION_STARTINGCSV":             "odf-prometheus-operator.v4.18.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
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 4.17.0
+VERSION ?= 4.18.0
 
 # MAX_OCP_VERSION variable specifies the maximum supported version of OCP.
 # Its purpose is to add an annotation to the CSV file, blocking OCP upgrades beyond the X+1 version.
@@ -73,22 +73,22 @@ CRD_OPTIONS ?= "crd"
 
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
-OCS_BUNDLE_VERSION ?= v4.17.0
-OCS_BUNDLE_IMG_TAG ?= release-4.17-772eb9c
+OCS_BUNDLE_VERSION ?= v4.18.0
+OCS_BUNDLE_IMG_TAG ?= main-5bce897
 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.17.0
-OCS_CLIENT_BUNDLE_IMG_TAG ?= main-5595a28
+OCS_CLIENT_BUNDLE_VERSION ?= v4.18.0
+OCS_CLIENT_BUNDLE_IMG_TAG ?= main-284e512
 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)
 
 NOOBAA_BUNDLE_NAME ?= noobaa-operator
 NOOBAA_BUNDLE_IMG_NAME ?= $(NOOBAA_BUNDLE_NAME)-bundle
 NOOBAA_BUNDLE_VERSION ?= v5.18.0
-NOOBAA_BUNDLE_IMG_TAG ?= master-20240829
+NOOBAA_BUNDLE_IMG_TAG ?= master-20241111
 NOOBAA_BUNDLE_IMG_LOCATION ?= quay.io/noobaa
 NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(NOOBAA_BUNDLE_IMG_TAG)
 
@@ -101,8 +101,8 @@ CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_
 
 CEPHCSI_BUNDLE_NAME ?= cephcsi-operator
 CEPHCSI_BUNDLE_IMG_NAME ?= $(CEPHCSI_BUNDLE_NAME)-bundle
-CEPHCSI_BUNDLE_VERSION ?= v4.17.0
-CEPHCSI_BUNDLE_IMG_TAG ?= release-4.17-fb535da
+CEPHCSI_BUNDLE_VERSION ?= v4.18.0
+CEPHCSI_BUNDLE_IMG_TAG ?= main-85233a5
 CEPHCSI_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 CEPHCSI_BUNDLE_IMG ?= $(CEPHCSI_BUNDLE_IMG_LOCATION)/$(CEPHCSI_BUNDLE_IMG_NAME):$(CEPHCSI_BUNDLE_IMG_TAG)
 
@@ -120,16 +120,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.17.0
-ROOK_BUNDLE_IMG_TAG ?= release-4.17-91cc5780b
+ROOK_BUNDLE_VERSION ?= v4.18.0
+ROOK_BUNDLE_IMG_TAG ?= master-793bbb006
 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.17.0
-PROMETHEUS_BUNDLE_IMG_TAG ?= main-d82716f
+PROMETHEUS_BUNDLE_VERSION ?= v4.18.0
+PROMETHEUS_BUNDLE_IMG_TAG ?= main-065cb99
 PROMETHEUS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_IMG_NAME):$(PROMETHEUS_BUNDLE_IMG_TAG)