Skip to content

Syncing latest changes from main for ocs-client-operator #514

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

Merged
openshift-merge-bot merged 1 commit into from
Jan 23, 2026
Merged

Syncing latest changes from main for ocs-client-operator #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 0 additions & 18 deletions bundle/manifests/csi-images-v4.19
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions bundle/manifests/csi-images-v4.20
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

14 changes: 7 additions & 7 deletions bundle/manifests/csi-images-v4.21
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

18 changes: 18 additions & 0 deletions bundle/manifests/csi-images-v4.22
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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: {}
Expand Down Expand Up @@ -689,4 +689,4 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 4.21.0
version: 4.22.0
18 changes: 9 additions & 9 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.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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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