Skip to content

Commit

Permalink
csi: add images for v4.15
Browse files Browse the repository at this point in the history
Signed-off-by: Rewant Soni <[email protected]>
  • Loading branch information
rewantsoni committed Mar 1, 2024
1 parent 4f444bf commit 20977d1
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 22 deletions.
38 changes: 24 additions & 14 deletions config/manager/csi-images.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
---
- version: v4.11
containerImages:
provisionerImageURL: "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0"
attacherImageURL: "registry.k8s.io/sig-storage/csi-attacher:v4.0.0"
resizerImageURL: "registry.k8s.io/sig-storage/csi-resizer:v1.6.0"
snapshotterImageURL: "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0"
driverRegistrarImageURL: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1"
cephCSIImageURL: "quay.io/cephcsi/cephcsi:v3.7.2"
csiaddonsImageURL: "quay.io/csiaddons/k8s-sidecar:v0.5.0"
provisionerImageURL: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0"
attacherImageURL: "registry.k8s.io/sig-storage/csi-attacher:v4.5.0"
resizerImageURL: "registry.k8s.io/sig-storage/csi-resizer:v1.10.0"
snapshotterImageURL: "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1"
driverRegistrarImageURL: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0"
cephCSIImageURL: "quay.io/cephcsi/cephcsi:v3.10.2"
csiaddonsImageURL: "quay.io/csiaddons/k8s-sidecar:v0.8.0"

- version: v4.12
containerImages:
provisionerImageURL: "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0"
attacherImageURL: "registry.k8s.io/sig-storage/csi-attacher:v4.0.0"
resizerImageURL: "registry.k8s.io/sig-storage/csi-resizer:v1.6.0"
snapshotterImageURL: "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0"
driverRegistrarImageURL: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1"
cephCSIImageURL: "quay.io/cephcsi/cephcsi:v3.7.2"
csiaddonsImageURL: "quay.io/csiaddons/k8s-sidecar:v0.5.0"
provisionerImageURL: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0"
attacherImageURL: "registry.k8s.io/sig-storage/csi-attacher:v4.5.0"
resizerImageURL: "registry.k8s.io/sig-storage/csi-resizer:v1.10.0"
snapshotterImageURL: "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1"
driverRegistrarImageURL: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0"
cephCSIImageURL: "quay.io/cephcsi/cephcsi:v3.10.2"
csiaddonsImageURL: "quay.io/csiaddons/k8s-sidecar:v0.8.0"

- version: v4.15
containerImages:
provisionerImageURL: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0"
attacherImageURL: "registry.k8s.io/sig-storage/csi-attacher:v4.5.0"
resizerImageURL: "registry.k8s.io/sig-storage/csi-resizer:v1.10.0"
snapshotterImageURL: "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1"
driverRegistrarImageURL: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0"
cephCSIImageURL: "quay.io/cephcsi/cephcsi:v3.10.2"
csiaddonsImageURL: "quay.io/csiaddons/k8s-sidecar:v0.8.0"
16 changes: 8 additions & 8 deletions hack/make-bundle-vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,19 @@ IMAGE_LOCATION_REDHAT_OCP ?= registry.redhat.io/openshift4
IMAGE_LOCATION_REDHAT_ODF ?= registry.redhat.io/odf4

DEFAULT_CSI_IMG_PROVISIONER_NAME ?= csi-provisioner
DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v3.3.0
DEFAULT_CSI_IMG_PROVISIONER_VERSION ?= v4.0.0
DEFAULT_CSI_IMG_ATTACHER_NAME ?= csi-attacher
DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.0.0
DEFAULT_CSI_IMG_ATTACHER_VERSION ?= v4.5.0
DEFAULT_CSI_IMG_RESIZER_NAME ?= csi-resizer
DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.6.0
DEFAULT_CSI_IMG_RESIZER_VERSION ?= v1.10.0
DEFAULT_CSI_IMG_SNAPSHOTTER_NAME ?= csi-snapshotter
DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v6.1.0
DEFAULT_CSI_IMG_SNAPSHOTTER_VERSION ?= v7.0.1
DEFAULT_CSI_IMG_REGISTRAR_NAME ?= csi-node-driver-registrar
DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.5.1
DEFAULT_CSI_IMG_REGISTRAR_VERSION ?= v2.10.0
DEFAULT_CSI_IMG_ADDONS_NAME ?= k8s-sidecar
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.5.0
DEFAULT_CSI_IMG_ADDONS_VERSION ?= v0.8.0
DEFAULT_CSI_IMG_CEPH_CSI_NAME ?= cephcsi
DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.7.2
DEFAULT_CSI_IMG_CEPH_CSI_VERSION ?= v3.10.2

CSI_IMG_PROVISIONER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_PROVISIONER_NAME):$(DEFAULT_CSI_IMG_PROVISIONER_VERSION)
CSI_IMG_ATTACHER ?= $(IMAGE_LOCATION_SIG_STORAGE)/$(DEFAULT_CSI_IMG_ATTACHER_NAME):$(DEFAULT_CSI_IMG_ATTACHER_VERSION)
Expand Down Expand Up @@ -155,4 +155,4 @@ CSI_IMG_CEPH_CSI ?= $(IMAGE_LOCATION_CEPH_CSI)/$(DEFAULT_CSI_IMG_CEPH_CSI_NAME):
# CSI_IMG_ADDONS_v4_x ?= quay.io/csiaddons/k8s-sidecar:v3
# CSI_IMG_CEPH_CSI_v4_x ?= cephcsi:v0.1

CSI_OCP_VERSIONS ?= v4.11 v4.12
CSI_OCP_VERSIONS ?= v4.11 v4.12 v4.15

0 comments on commit 20977d1

Please sign in to comment.