Merge pull request #327 from iamniting/version

makefile: update csv version
red-hat-storage · Jul 18, 2023 · f834aad · f834aad
2 parents 335a062 + 62c123a
commit f834aad
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 36 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -5,25 +5,25 @@ data:
  CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
  CSIADDONS_SUBSCRIPTION_NAME: csi-addons
  CSIADDONS_SUBSCRIPTION_PACKAGE: csi-addons
- CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.6.0
+ CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.7.0
  IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
  IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
- IBM_SUBSCRIPTION_CHANNEL: stable-v1.4
+ IBM_SUBSCRIPTION_CHANNEL: stable-v1.5
  IBM_SUBSCRIPTION_NAME: ibm-storage-odf-operator
  IBM_SUBSCRIPTION_PACKAGE: ibm-storage-odf-operator
- IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.4.0
+ IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.5.0
  NOOBAA_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
  NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
  NOOBAA_SUBSCRIPTION_CHANNEL: alpha
  NOOBAA_SUBSCRIPTION_NAME: noobaa-operator
  NOOBAA_SUBSCRIPTION_PACKAGE: noobaa-operator
- NOOBAA_SUBSCRIPTION_STARTINGCSV: noobaa-operator.v5.13.0
+ NOOBAA_SUBSCRIPTION_STARTINGCSV: noobaa-operator.v5.14.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.13.0
+ OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.14.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
@@ -38,7 +38,7 @@ metadata:
  createdAt: "2023-07-05T11:25:37Z"
  description: OpenShift Data Foundation provides a common control plane for storage
  solutions on OpenShift Container Platform.
- olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.14"}]'
+ olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]'
  olm.skipRange: ""
  operatorframework.io/initialization-resource: |-
  {
@@ -68,7 +68,7 @@ metadata:
  operatorframework.io/arch.amd64: supported
  operatorframework.io/arch.ppc64le: supported
  operatorframework.io/arch.s390x: supported
- name: odf-operator.v4.13.0
+ name: odf-operator.v4.14.0
  namespace: placeholder
 spec:
  apiservicedefinitions: {}
@@ -578,4 +578,4 @@ spec:
  maturity: alpha
  provider:
  name: Red Hat
- version: 4.13.0
+ version: 4.14.0
diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -2,12 +2,12 @@ dependencies:
 - type: olm.package
  value:
  packageName: ocs-operator
- version: ">=4.12.0 <4.13.0 || 4.13.0"
+ version: ">=4.13.0 <4.14.0 || 4.14.0"
 - type: olm.package
  value:
  packageName: noobaa-operator
- version: "5.13.0"
+ version: "5.14.0"
 - type: olm.package
  value:
  packageName: csi-addons
- version: "0.6.0"
+ version: "0.7.0"
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.13.0
+ - name: odf-operator.v4.14.0
 
 ---
 defaultChannel: alpha
@@ -18,7 +18,7 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
- - name: ocs-operator.v4.13.0
+ - name: ocs-operator.v4.14.0
 
 ---
 defaultChannel: alpha
@@ -29,7 +29,7 @@ schema: olm.channel
 package: noobaa-operator
 name: alpha
 entries:
- - name: noobaa-operator.v5.13.0
+ - name: noobaa-operator.v5.14.0
 
 ---
 defaultChannel: alpha
@@ -40,15 +40,15 @@ schema: olm.channel
 package: csi-addons
 name: alpha
 entries:
- - name: csi-addons.v0.6.0
+ - name: csi-addons.v0.7.0
 
 ---
-defaultChannel: stable-v1.4
+defaultChannel: stable-v1.5
 name: ibm-storage-odf-operator
 schema: olm.package
 ---
 schema: olm.channel
 package: ibm-storage-odf-operator
-name: stable-v1.4
+name: stable-v1.5
 entries:
- - name: ibm-storage-odf-operator.v1.4.0
+ - name: ibm-storage-odf-operator.v1.5.0
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -1,24 +1,24 @@
 NOOBAA_SUBSCRIPTION_NAME=noobaa-operator
 NOOBAA_SUBSCRIPTION_PACKAGE=noobaa-operator
 NOOBAA_SUBSCRIPTION_CHANNEL=alpha
-NOOBAA_SUBSCRIPTION_STARTINGCSV=noobaa-operator.v5.13.0
+NOOBAA_SUBSCRIPTION_STARTINGCSV=noobaa-operator.v5.14.0
 NOOBAA_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 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.6.0
+CSIADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.v0.7.0
 CSIADDONS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 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.13.0
+OCS_SUBSCRIPTION_STARTINGCSV=ocs-operator.v4.14.0
 OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator
 IBM_SUBSCRIPTION_PACKAGE=ibm-storage-odf-operator
-IBM_SUBSCRIPTION_CHANNEL=stable-v1.4
-IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.4.0
+IBM_SUBSCRIPTION_CHANNEL=stable-v1.5
+IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.5.0
 IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
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.14"}]'
+ olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]'
  olm.skipRange: ""
  operators.operatorframework.io/operator-type: standalone
 patches:

diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -27,28 +27,28 @@ var (
  "NOOBAA_SUBSCRIPTION_NAME": "noobaa-operator",
  "NOOBAA_SUBSCRIPTION_PACKAGE": "noobaa-operator",
  "NOOBAA_SUBSCRIPTION_CHANNEL": "alpha",
- "NOOBAA_SUBSCRIPTION_STARTINGCSV": "noobaa-operator.v5.13.0",
+ "NOOBAA_SUBSCRIPTION_STARTINGCSV": "noobaa-operator.v5.14.0",
  "NOOBAA_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
  "NOOBAA_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.13.0",
+ "OCS_SUBSCRIPTION_STARTINGCSV": "ocs-operator.v4.14.0",
  "OCS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
  "OCS_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.6.0",
+ "CSIADDONS_SUBSCRIPTION_STARTINGCSV": "csi-addons.v0.7.0",
  "CSIADDONS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
  "CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 
  "IBM_SUBSCRIPTION_NAME": "ibm-storage-odf-operator",
  "IBM_SUBSCRIPTION_PACKAGE": "ibm-storage-odf-operator",
- "IBM_SUBSCRIPTION_CHANNEL": "stable-v1.4",
- "IBM_SUBSCRIPTION_STARTINGCSV": "ibm-storage-odf-operator.v1.4.0",
+ "IBM_SUBSCRIPTION_CHANNEL": "stable-v1.5",
+ "IBM_SUBSCRIPTION_STARTINGCSV": "ibm-storage-odf-operator.v1.5.0",
  "IBM_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
  "IBM_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.13.0
+VERSION ?= 4.14.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,25 +69,25 @@ CRD_OPTIONS ?= "crd"
 
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
-OCS_BUNDLE_IMG_TAG ?= v4.13.0
+OCS_BUNDLE_IMG_TAG ?= v4.14.0
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)
 
 NOOBAA_BUNDLE_NAME ?= noobaa-operator
 NOOBAA_BUNDLE_IMG_NAME ?= $(NOOBAA_BUNDLE_NAME)-bundle
-NOOBAA_BUNDLE_IMG_TAG ?= v5.13.0
-NOOBAA_BUNDLE_IMG_LOCATION ?= docker.io/noobaa
+NOOBAA_BUNDLE_IMG_TAG ?= v5.14.0
+NOOBAA_BUNDLE_IMG_LOCATION ?= quay.io/noobaa
 NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(NOOBAA_BUNDLE_IMG_TAG)
 
 CSIADDONS_BUNDLE_NAME ?= csi-addons
 CSIADDONS_BUNDLE_IMG_NAME ?= k8s-bundle
-CSIADDONS_BUNDLE_IMG_TAG ?= v0.6.0
+CSIADDONS_BUNDLE_IMG_TAG ?= v0.7.0
 CSIADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons
 CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_NAME):$(CSIADDONS_BUNDLE_IMG_TAG)
 
 IBM_BUNDLE_NAME ?= ibm-storage-odf-operator
 IBM_BUNDLE_IMG_NAME ?= $(IBM_BUNDLE_NAME)-bundle
-IBM_BUNDLE_IMG_TAG ?= 1.4.0
+IBM_BUNDLE_IMG_TAG ?= 1.5.0
 IBM_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)
 
@@ -133,7 +133,7 @@ OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)
 
 IBM_SUBSCRIPTION_NAME ?= $(IBM_BUNDLE_NAME)
 IBM_SUBSCRIPTION_PACKAGE ?= $(IBM_BUNDLE_NAME)
-IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.4
+IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.5
 IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG)
 IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)