diff --git a/bundle/manifests/csi-images-v4.19 b/bundle/manifests/csi-images-v4.19 deleted file mode 100644 index 1fd5e8fb..00000000 --- a/bundle/manifests/csi-images-v4.19 +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: csi-images-v4.19 - labels: - ocs.openshift.io/csi-images-version: v4.19 -data: - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0 - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0 - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2 - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 - snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.1.0 - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0 - plugin: quay.io/cephcsi/cephcsi:v3.15.0 - addons: quay.io/csiaddons/k8s-sidecar:v0.13.0 - ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest - diff --git a/bundle/manifests/csi-images-v4.20 b/bundle/manifests/csi-images-v4.20 index bbc9671c..8bee61f7 100644 --- a/bundle/manifests/csi-images-v4.20 +++ b/bundle/manifests/csi-images-v4.20 @@ -6,13 +6,13 @@ metadata: labels: ocs.openshift.io/csi-images-version: v4.20 data: - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0 - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0 - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2 - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 - snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.1.0 - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 + snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 plugin: quay.io/cephcsi/cephcsi:v3.15.0 - addons: quay.io/csiaddons/k8s-sidecar:v0.13.0 + addons: quay.io/csiaddons/k8s-sidecar:v0.14.0 ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest diff --git a/bundle/manifests/csi-images-v4.21 b/bundle/manifests/csi-images-v4.21 index 54d5daf4..4f9a1c95 100644 --- a/bundle/manifests/csi-images-v4.21 +++ b/bundle/manifests/csi-images-v4.21 @@ -6,13 +6,13 @@ metadata: labels: ocs.openshift.io/csi-images-version: v4.21 data: - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0 - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0 - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2 - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 - snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.1.0 - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 + snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 plugin: quay.io/cephcsi/cephcsi:v3.15.0 - addons: quay.io/csiaddons/k8s-sidecar:v0.13.0 + addons: quay.io/csiaddons/k8s-sidecar:v0.14.0 ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest diff --git a/bundle/manifests/csi-images-v4.22 b/bundle/manifests/csi-images-v4.22 new file mode 100644 index 00000000..ee0e4277 --- /dev/null +++ b/bundle/manifests/csi-images-v4.22 @@ -0,0 +1,18 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: csi-images-v4.22 + labels: + ocs.openshift.io/csi-images-version: v4.22 +data: + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 + snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 + plugin: quay.io/cephcsi/cephcsi:v3.15.0 + addons: quay.io/csiaddons/k8s-sidecar:v0.14.0 + ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest + diff --git a/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml b/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml index 98653304..a0959166 100644 --- a/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml +++ b/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml @@ -7,7 +7,7 @@ metadata: categories: Storage console.openshift.io/plugins: '["odf-client-console"]' containerImage: quay.io/ocs-dev/ocs-client-operator:latest - createdAt: "2026-01-01T05:22:11Z" + createdAt: "2026-01-22T06:52:52Z" description: OpenShift Data Foundation client operator enables consumption of storage services from a remote centralized OpenShift Data Foundation provider cluster. @@ -23,7 +23,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: ocs-client-operator.v4.21.0 + name: ocs-client-operator.v4.22.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -689,4 +689,4 @@ spec: maturity: alpha provider: name: Red Hat - version: 4.21.0 + version: 4.22.0 diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index 871c1530..d0615a92 100644 --- 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.21.0 +VERSION ?= 4.22.0 # DEFAULT_CHANNEL defines the default channel used in the bundle. # Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable") @@ -151,19 +151,19 @@ IMAGE_LOCATION_REDHAT_ODF ?= registry.redhat.io/odf4 IMAGE_LOCATION_ODF_SNAPSHOTTER ?= quay.io/ocs-dev DEFAULT_CSI_IMG_PROVISIONER_NAME ?= csi-provisioner -DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v5.3.0 +DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v6.0.0 DEFAULT_CSI_IMG_ATTACHER_NAME ?= csi-attacher -DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.9.0 +DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.10.0 DEFAULT_CSI_IMG_RESIZER_NAME ?= csi-resizer -DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.13.2 +DEFAULT_CSI_IMG_RESIZER_VERSION ?= v2.0.0 DEFAULT_CSI_IMG_SNAPSHOTTER_NAME ?= csi-snapshotter -DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.2.0 +DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.4.0 DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME ?= csi-snapshot-metadata -DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.1.0 +DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.2.0 DEFAULT_CSI_IMG_REGISTRAR_NAME ?= csi-node-driver-registrar -DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.14.0 +DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.15.0 DEFAULT_CSI_IMG_ADDONS_NAME ?= k8s-sidecar -DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.13.0 +DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.14.0 DEFAULT_CSI_IMG_CEPH_CSI_NAME ?= cephcsi DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.15.0 DEFAULT_CSI_IMG_ODF_SNAPSHOTTER_NAME ?= csi-snapshotter @@ -199,4 +199,4 @@ CSI_IMG_ODF_SNAPSHOTTER ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(DEFAULT_CSI_IMG_O # CSI_IMG_ODF_SNAPSHOTTER_v4_x ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(CSI_IMG_ODF_SNAPSHOTTER_NAME):v1 # we will maintain N (VERSION var in this file) through and including N-2 versions -CSI_OCP_VERSIONS ?= v4.19 v4.20 v4.21 +CSI_OCP_VERSIONS ?= v4.20 v4.21 v4.22