From e8c501ba8ee943f5c1af3dac3e71e204e0e5319f Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 2 Oct 2025 07:59:31 -0600 Subject: [PATCH] build: add csi operator image to images.txt With the addition of the csi operator, the csi operator image is added to the list of images that are required for deploying rook. Signed-off-by: Travis Nielsen (cherry picked from commit 535f9f08687881fad7f2ebf50a7e1749cca1f0e9) --- deploy/examples/images.txt | 1 + images/ceph/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 837ce9c2d..825ad517e 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -2,6 +2,7 @@ gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 quay.io/ceph/ceph:v19.2.3 quay.io/ceph/cosi:v0.1.2 + quay.io/cephcsi/ceph-csi-operator:v0.4.1 quay.io/cephcsi/cephcsi:v3.15.0 quay.io/csiaddons/k8s-sidecar:v0.13.0 registry.k8s.io/sig-storage/csi-attacher:v4.8.1 diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 63306b4eb..8c7fed9c4 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -96,12 +96,12 @@ IMAGE_TMP="/tmp/rook-ceph-image-list" list-image: ## Create a list of images for offline installation @echo "producing list of images for offline installation" rm -f $(IMAGE_TMP) - awk '/image:/ {print $2}' $(MANIFESTS_DIR)/operator.yaml $(MANIFESTS_DIR)/cluster.yaml | \ + awk '/image:/ {print $2}' $(MANIFESTS_DIR)/operator.yaml $(MANIFESTS_DIR)/cluster.yaml $(MANIFESTS_DIR)/csi-operator.yaml | \ cut -d: -f2- | tee $(IMAGE_TMP) awk '/quay.io/ || /registry.k8s.io/ {print $3}' ../../pkg/operator/ceph/csi/spec.go | \ cut -d= -f2- | tr -d '"' | tee -a $(IMAGE_TMP) awk '/quay.io/ || /gcr.io/ {print $4}' ../../pkg/operator/ceph/object/cosi/spec.go | \ cut -d= -f2- | tr -d '"' | tee -a $(IMAGE_TMP) rm -f $(MANIFESTS_DIR)/images.txt - cat $(IMAGE_TMP) | sort -h | uniq | tee $(MANIFESTS_DIR)/images.txt + cat $(IMAGE_TMP) | sort -h | uniq | grep -v '^[[:space:]]*$$' | tee $(MANIFESTS_DIR)/images.txt rm -f $(IMAGE_TMP)