Merge pull request #346 from red-hat-storage/4_15

makefile: update csv version to 4.15.0
red-hat-storage · Nov 30, 2023 · 47e5643 · 47e5643
2 parents dc9302e + aac0362
commit 47e5643
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -23,7 +23,7 @@ data:
   OCS_SUBSCRIPTION_CHANNEL: alpha
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
-  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.14.0
+  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.15.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: "2023-11-20T09:25:53Z"
+    createdAt: "2023-11-28T10:45:09Z"
     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.15"}]'
+    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.16"}]'
     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.14.0
+  name: odf-operator.v4.15.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -585,4 +585,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 4.14.0
+  version: 4.15.0
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.13.0 <4.14.0 || 4.14.0"
+    version: ">=4.14.0 <4.15.0 || 4.15.0"
 - type: olm.package
   value:
     packageName: noobaa-operator

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.14.0
+  - name: odf-operator.v4.15.0
 
 ---
 defaultChannel: alpha
@@ -18,7 +18,7 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
-  - name: ocs-operator.v4.14.0
+  - name: ocs-operator.v4.15.0
 
 ---
 defaultChannel: alpha

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.14.0
+OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.15.0
 OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator

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.15"}]'
+  olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.16"}]'
   olm.skipRange: ""
   operators.operatorframework.io/operator-type: standalone
 patches:

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.14.0",
+		"OCS_SUBSCRIPTION_STARTINGCSV":             "ocs-operator.v4.15.0",
 		"OCS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"OCS_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.14.0
+VERSION ?= 4.15.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.
@@ -69,7 +69,7 @@ CRD_OPTIONS ?= "crd"
 
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
-OCS_BUNDLE_IMG_TAG ?= v4.14.0
+OCS_BUNDLE_IMG_TAG ?= v4.15.0
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)