Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makefile: update csv version to 4.15.0 #346

Merged
merged 2 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/odf-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
{
Expand Down Expand Up @@ -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: {}
Expand Down Expand Up @@ -585,4 +585,4 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 4.14.0
version: 4.15.0
2 changes: 1 addition & 1 deletion bundle/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions catalog/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/bases/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion controllers/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down
4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)

Expand Down
Loading