Skip to content

Commit

Permalink
build: use pkg/operator/ceph/csi/spec.go for csi images
Browse files Browse the repository at this point in the history
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: #8687
Signed-off-by: subhamkrai <srai@redhat.com>
(cherry picked from commit 284dbc0)
  • Loading branch information
subhamkrai authored and mergify-bot committed Sep 13, 2021
1 parent d858972 commit 12a646e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cluster/examples/kubernetes/ceph/images.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions images/ceph/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 12a646e

Please sign in to comment.