Skip to content

Commit 7ae85d6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #489 from red-hat-storage/sync_ds--main
Syncing latest changes from main for ocs-client-operator
2 parents fb3fa2e + 8b465a8 commit 7ae85d6

File tree

6 files changed

+25
-15
lines changed

6 files changed

+25
-15
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ data:
1010
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
1111
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
1212
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
1314
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
14-
plugin: quay.io/cephcsi/cephcsi:v3.14.1
15-
addons: quay.io/csiaddons/k8s-sidecar:v0.12.0
15+
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.13.0
1617
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
1718

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ data:
1010
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
1111
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
1212
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
1314
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
14-
plugin: quay.io/cephcsi/cephcsi:v3.14.1
15-
addons: quay.io/csiaddons/k8s-sidecar:v0.12.0
15+
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.13.0
1617
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
1718

bundle/manifests/csi-images-v4.18 renamed to bundle/manifests/csi-images-v4.21

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:
5-
name: csi-images-v4.18
5+
name: csi-images-v4.21
66
labels:
7-
ocs.openshift.io/csi-images-version: v4.18
7+
ocs.openshift.io/csi-images-version: v4.21
88
data:
99
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0
1010
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
1111
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
1212
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
1314
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
14-
plugin: quay.io/cephcsi/cephcsi:v3.14.1
15-
addons: quay.io/csiaddons/k8s-sidecar:v0.12.0
15+
plugin: quay.io/cephcsi/cephcsi:v3.15.0
16+
addons: quay.io/csiaddons/k8s-sidecar:v0.13.0
1617
ex-snapshotter: quay.io/ocs-dev/csi-snapshotter:latest
1718

‎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: "2025-10-09T11:48:09Z"
10+
createdAt: "2025-10-14T07:11:08Z"
1111
description: OpenShift Data Foundation client operator enables consumption of
1212
storage services from a remote centralized OpenShift Data Foundation provider
1313
cluster.
@@ -22,7 +22,7 @@ metadata:
2222
operatorframework.io/arch.amd64: supported
2323
operatorframework.io/arch.ppc64le: supported
2424
operatorframework.io/arch.s390x: supported
25-
name: ocs-client-operator.v4.20.0
25+
name: ocs-client-operator.v4.21.0
2626
namespace: placeholder
2727
spec:
2828
apiservicedefinitions: {}
@@ -696,4 +696,4 @@ spec:
696696
maturity: alpha
697697
provider:
698698
name: Red Hat
699-
version: 4.20.0
699+
version: 4.21.0

‎hack/create-csi-images-manifest.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ for version in ${CSI_OCP_VERSIONS}; do
1919
snapshotter="CSI_IMG_SNAPSHOTTER_${VER}"
2020
SNAPSHOTTER=${!snapshotter:-${CSI_IMG_SNAPSHOTTER}}
2121

22+
snapshot_metadata="CSI_IMG_SNAPSHOT_METADATA_${VER}"
23+
SNAPSHOT_METADATA=${!snapshot_metadata:-${CSI_IMG_SNAPSHOT_METADATA}}
24+
2225
registrar="CSI_IMG_REGISTRAR_${VER}"
2326
REGISTRAR=${!registrar:-${CSI_IMG_REGISTRAR}}
2427

@@ -43,6 +46,7 @@ data:
4346
attacher: "$ATTACHER"
4447
resizer: "$RESIZER"
4548
snapshotter: "$SNAPSHOTTER"
49+
snapshot-metadata: "$SNAPSHOT_METADATA"
4650
registrar: "$REGISTRAR"
4751
plugin: "$PLUGIN"
4852
addons: "$ADDONS"

‎hack/make-bundle-vars.mk‎

Lines changed: 7 additions & 4 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.20.0
6+
VERSION ?= 4.21.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")
@@ -158,19 +158,22 @@ DEFAULT_CSI_IMG_RESIZER_NAME ?= csi-resizer
158158
DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.13.2
159159
DEFAULT_CSI_IMG_SNAPSHOTTER_NAME ?= csi-snapshotter
160160
DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.2.0
161+
DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME ?= csi-snapshot-metadata
162+
DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.1.0
161163
DEFAULT_CSI_IMG_REGISTRAR_NAME ?= csi-node-driver-registrar
162164
DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.14.0
163165
DEFAULT_CSI_IMG_ADDONS_NAME ?= k8s-sidecar
164-
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.12.0
166+
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.13.0
165167
DEFAULT_CSI_IMG_CEPH_CSI_NAME ?= cephcsi
166-
DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.14.1
168+
DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.15.0
167169
DEFAULT_CSI_IMG_ODF_SNAPSHOTTER_NAME ?= csi-snapshotter
168170
DEFAULT_CSI_IMG_ODF_SNAPSHOTTER_VERSION ?= latest
169171

170172
CSI_IMG_PROVISIONER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_PROVISIONER_NAME):$(DEFAULT_CSI_IMG_PROVISIONER_VERSION)
171173
CSI_IMG_ATTACHER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_ATTACHER_NAME):$(DEFAULT_CSI_IMG_ATTACHER_VERSION)
172174
CSI_IMG_RESIZER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_RESIZER_NAME):$(DEFAULT_CSI_IMG_RESIZER_VERSION)
173175
CSI_IMG_SNAPSHOTTER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_SNAPSHOTTER_NAME):$(DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION)
176+
CSI_IMG_SNAPSHOT_METADATA ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME):$(DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION)
174177
CSI_IMG_REGISTRAR ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_REGISTRAR_NAME):$(DEFAULT_CSI_IMG_REGISTRAR_VERSION)
175178
CSI_IMG_ADDONS ?= $(IMAGE_LOCATION_CSI_ADDONS)/$(DEFAULT_CSI_IMG_ADDONS_NAME):$(DEFAULT_CSI_IMG_ADDONS_VERSION)
176179
CSI_IMG_CEPH_CSI ?= $(IMAGE_LOCATION_CEPH_CSI)/$(DEFAULT_CSI_IMG_CEPH_CSI_NAME):$(DEFAULT_CSI_IMG_CEPH_CSI_VERSION)
@@ -196,4 +199,4 @@ CSI_IMG_ODF_SNAPSHOTTER ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(DEFAULT_CSI_IMG_O
196199
# CSI_IMG_ODF_SNAPSHOTTER_v4_x ?= $(IMAGE_LOCATION_ODF_SNAPSHOTTER)/$(CSI_IMG_ODF_SNAPSHOTTER_NAME):v1
197200

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

0 commit comments

Comments
 (0)