Merge pull request #8705 from rook/mergify/bp/release-1.7/pr-8699

build: use pkg/operator/ceph/csi/spec.go for csi images (backport #8699)
rook · Sep 13, 2021 · fece4f2 · fece4f2
2 parents 8e242e7 + 12a646e
commit fece4f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -134,6 +134,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