Skip to content

Commit 2083ee5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #512 from leelavg/csi-images
bundle: update df and csi images versions
2 parents 1e2fdc8 + a3f7bdf commit 2083ee5

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

‎bundle/manifests/csi-images-v4.19‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎bundle/manifests/csi-images-v4.20‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ metadata:
66
labels:
77
ocs.openshift.io/csi-images-version: v4.20
88
data:
9-
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0
10-
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
11-
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
12-
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
13-
snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.1.0
14-
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
9+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0
10+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
11+
resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0
12+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
13+
snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0
14+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0
1515
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16-
addons: quay.io/csiaddons/k8s-sidecar:v0.13.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.14.0
1717
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
1818

‎bundle/manifests/csi-images-v4.21‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ metadata:
66
labels:
77
ocs.openshift.io/csi-images-version: v4.21
88
data:
9-
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0
10-
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
11-
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
12-
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
13-
snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.1.0
14-
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
9+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0
10+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
11+
resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0
12+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
13+
snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0
14+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0
1515
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16-
addons: quay.io/csiaddons/k8s-sidecar:v0.13.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.14.0
1717
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
1818

‎bundle/manifests/csi-images-v4.22‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: csi-images-v4.22
6+
labels:
7+
ocs.openshift.io/csi-images-version: v4.22
8+
data:
9+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0
10+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
11+
resizer: registry.k8s.io/sig-storage/csi-resizer:v2.0.0
12+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
13+
snapshot-metadata: registry.k8s.io/sig-storage/csi-snapshot-metadata:v0.2.0
14+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0
15+
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.14.0
17+
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
18+

‎bundle/manifests/ocs-client-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
categories: Storage
88
console.openshift.io/plugins: '["odf-client-console"]'
99
containerImage: quay.io/ocs-dev/ocs-client-operator:latest
10-
createdAt: "2026-01-01T05:22:11Z"
10+
createdAt: "2026-01-22T06:52:52Z"
1111
description: OpenShift Data Foundation client operator enables consumption of
1212
storage services from a remote centralized OpenShift Data Foundation provider
1313
cluster.
@@ -23,7 +23,7 @@ metadata:
2323
operatorframework.io/arch.arm64: supported
2424
operatorframework.io/arch.ppc64le: supported
2525
operatorframework.io/arch.s390x: supported
26-
name: ocs-client-operator.v4.21.0
26+
name: ocs-client-operator.v4.22.0
2727
namespace: placeholder
2828
spec:
2929
apiservicedefinitions: {}
@@ -689,4 +689,4 @@ spec:
689689
maturity: alpha
690690
provider:
691691
name: Red Hat
692-
version: 4.21.0
692+
version: 4.22.0

‎hack/make-bundle-vars.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 4.21.0
6+
VERSION ?= 4.22.0
77

88
# DEFAULT_CHANNEL defines the default channel used in the bundle.
99
# 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
151151
IMAGE_LOCATION_ODF_SNAPSHOTTER ?= quay.io/ocs-dev
152152

153153
DEFAULT_CSI_IMG_PROVISIONER_NAME ?= csi-provisioner
154-
DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v5.3.0
154+
DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v6.0.0
155155
DEFAULT_CSI_IMG_ATTACHER_NAME ?= csi-attacher
156-
DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.9.0
156+
DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.10.0
157157
DEFAULT_CSI_IMG_RESIZER_NAME ?= csi-resizer
158-
DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.13.2
158+
DEFAULT_CSI_IMG_RESIZER_VERSION ?= v2.0.0
159159
DEFAULT_CSI_IMG_SNAPSHOTTER_NAME ?= csi-snapshotter
160-
DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.2.0
160+
DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.4.0
161161
DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME ?= csi-snapshot-metadata
162-
DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.1.0
162+
DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.2.0
163163
DEFAULT_CSI_IMG_REGISTRAR_NAME ?= csi-node-driver-registrar
164-
DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.14.0
164+
DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.15.0
165165
DEFAULT_CSI_IMG_ADDONS_NAME ?= k8s-sidecar
166-
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.13.0
166+
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.14.0
167167
DEFAULT_CSI_IMG_CEPH_CSI_NAME ?= cephcsi
168168
DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.15.0
169169
DEFAULT_CSI_IMG_ODF_SNAPSHOTTER_NAME ?= csi-snapshotter
@@ -199,4 +199,4 @@ CSI_IMG_ODF_SNAPSHOTTER ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(DEFAULT_CSI_IMG_O
199199
# CSI_IMG_ODF_SNAPSHOTTER_v4_x ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(CSI_IMG_ODF_SNAPSHOTTER_NAME):v1
200200

201201
# we will maintain N (VERSION var in this file) through and including N-2 versions
202-
CSI_OCP_VERSIONS ?= v4.19 v4.20 v4.21
202+
CSI_OCP_VERSIONS ?= v4.20 v4.21 v4.22

0 commit comments

Comments
 (0)