From 284dbc0a0ef8b501c2557da48af5502a5d017ffc Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Mon, 13 Sep 2021 17:14:29 +0530 Subject: [PATCH] build: use pkg/operator/ceph/csi/spec.go for csi images it has happened more than once that the manifests do not reflect the images so now reading from `pkg/operator/ceph/csi/spec.go` as this what code uses. Closes: https://github.com/rook/rook/issues/8687 Signed-off-by: subhamkrai --- cluster/examples/kubernetes/ceph/images.txt | 4 ++-- images/ceph/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/images.txt b/cluster/examples/kubernetes/ceph/images.txt index bf7a39899..9323b7c75 100644 --- a/cluster/examples/kubernetes/ceph/images.txt +++ b/cluster/examples/kubernetes/ceph/images.txt @@ -2,8 +2,8 @@ quay.io/ceph/ceph:v16.2.5 quay.io/cephcsi/cephcsi:v3.4.0 k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0 - k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 - k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 k8s.gcr.io/sig-storage/csi-attacher:v3.2.1 + k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 + k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 quay.io/csiaddons/volumereplication-operator:v0.1.0 diff --git a/images/ceph/Makefile b/images/ceph/Makefile index a053b0865..19379f654 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -133,6 +133,6 @@ list-image: awk '/image:/ {print $2}' $(MANIFESTS_DIR)/operator.yaml $(MANIFESTS_DIR)/cluster.yaml | \ cut -d: -f2- |\ tee -a $(MANIFESTS_DIR)/images.txt && \ - awk '/quay.io/ || /k8s.gcr.io/ {print $3}' $(MANIFESTS_DIR)/operator.yaml | \ - cut -d: -f2- |\ + awk '/quay.io/ || /k8s.gcr.io/ {print $3}' ../../pkg/operator/ceph/csi/spec.go | \ + cut -d= -f2- |\ tr -d '"' | tee -a $(MANIFESTS_DIR)/images.txt