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.

Sign up for GitHub

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

Update version to 4.18 #501

Merged
merged 5 commits into from
Nov 13, 2024
Merged

Update version to 4.18 #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f8bd2a
makefile: update CSV versions
iamniting Nov 13, 2024
b3120c8
bundle: update generated changes
iamniting Nov 13, 2024
555f766
catalog: update catalog changes
iamniting Nov 13, 2024
c8426c7
controllers: update CSV versions in defaults
iamniting Nov 13, 2024
5c30158
bundle: update dependencies versions
iamniting Nov 13, 2024
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
10 changes: 5 additions & 5 deletions bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/odf-operator.clusterserviceversion.yaml
View file
Open in desktop
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: "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: |-
{
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.17.0
name: odf-operator.v4.18.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -565,4 +565,4 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 4.17.0
version: 4.18.0
10 changes: 5 additions & 5 deletions bundle/metadata/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions catalog/cephcsi.yaml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions catalog/index.yaml
View file
Open in desktop
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.17.0
- name: odf-operator.v4.18.0

---
defaultChannel: alpha
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions catalog/noobaa.yaml
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions catalog/ocs-client.yaml
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions catalog/ocs.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions catalog/prometheus.yaml
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 26 additions & 23 deletions catalog/rook.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions config/manager/manager.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/bases/kustomization.yaml
View file
Open in desktop
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.18"}]'
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
olm.skipRange: ""
operators.operatorframework.io/operator-type: standalone
patches:
Expand Down
10 changes: 5 additions & 5 deletions controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand All @@ -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",

Expand All @@ -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",

Expand Down
24 changes: 12 additions & 12 deletions hack/make-bundle-vars.mk
View file
Open in desktop
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.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.
Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand Down
Loading