Merge pull request #484 from leelavg/bump-csv-ver

bundle: add a new sidecar csi-snapshot-metadata

Author: openshift-merge-bot[bot]

bundle/manifests/csi-images-v4.19

@@ -10,6 +10,7 @@ data:
   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

bundle/manifests/csi-images-v4.20

@@ -10,6 +10,7 @@ data:
   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

bundle/manifests/csi-images-v4.21

@@ -10,6 +10,7 @@ data:
   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

hack/create-csi-images-manifest.sh

@@ -19,6 +19,9 @@ for version in ${CSI_OCP_VERSIONS}; do
   snapshotter="CSI_IMG_SNAPSHOTTER_${VER}"
   SNAPSHOTTER=${!snapshotter:-${CSI_IMG_SNAPSHOTTER}}
 
+  snapshot_metadata="CSI_IMG_SNAPSHOT_METADATA_${VER}"
+  SNAPSHOT_METADATA=${!snapshot_metadata:-${CSI_IMG_SNAPSHOT_METADATA}}
+
   registrar="CSI_IMG_REGISTRAR_${VER}"
   REGISTRAR=${!registrar:-${CSI_IMG_REGISTRAR}}
 
@@ -43,6 +46,7 @@ data:
   attacher: "$ATTACHER"
   resizer: "$RESIZER"
   snapshotter: "$SNAPSHOTTER"
+  snapshot-metadata: "$SNAPSHOT_METADATA"
   registrar: "$REGISTRAR"
   plugin: "$PLUGIN"
   addons: "$ADDONS"

hack/make-bundle-vars.mk

@@ -158,6 +158,8 @@ DEFAULT_CSI_IMG_RESIZER_NAME ?= csi-resizer
 DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.13.2
 DEFAULT_CSI_IMG_SNAPSHOTTER_NAME ?= csi-snapshotter
 DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v8.2.0
+DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME ?= csi-snapshot-metadata
+DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION ?= v0.1.0
 DEFAULT_CSI_IMG_REGISTRAR_NAME ?= csi-node-driver-registrar
 DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.14.0
 DEFAULT_CSI_IMG_ADDONS_NAME ?= k8s-sidecar
@@ -171,6 +173,7 @@ CSI_IMG_PROVISIONER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_PROVISION
 CSI_IMG_ATTACHER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_ATTACHER_NAME):$(DEFAULT_CSI_IMG_ATTACHER_VERSION)
 CSI_IMG_RESIZER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_RESIZER_NAME):$(DEFAULT_CSI_IMG_RESIZER_VERSION)
 CSI_IMG_SNAPSHOTTER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_SNAPSHOTTER_NAME):$(DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION)
+CSI_IMG_SNAPSHOT_METADATA ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_SNAPSHOT_METADATA_NAME):$(DEFAULT_CSI_IMG_SNAPSHOT_METADATA_VERSION)
 CSI_IMG_REGISTRAR ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_REGISTRAR_NAME):$(DEFAULT_CSI_IMG_REGISTRAR_VERSION)
 CSI_IMG_ADDONS ?= $(IMAGE_LOCATION_CSI_ADDONS)/$(DEFAULT_CSI_IMG_ADDONS_NAME):$(DEFAULT_CSI_IMG_ADDONS_VERSION)
 CSI_IMG_CEPH_CSI ?= $(IMAGE_LOCATION_CEPH_CSI)/$(DEFAULT_CSI_IMG_CEPH_CSI_NAME):$(DEFAULT_CSI_IMG_CEPH_CSI_VERSION)