From c5bcab14edac1fa5fe45ba71e92fc1fb650d83aa Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Tue, 5 Mar 2024 17:06:37 +0530 Subject: [PATCH] build: add changes to support csv generation this commits modifies the Makefile to support csv generation in downstream repo. Later, from upstream csv generation files will be removed. Signed-off-by: subhamkrai --- images/ceph/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ceph/Makefile b/images/ceph/Makefile index e93dab7d9fc8c..1e2a6a822d4ce 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -84,7 +84,6 @@ ifeq ($(INCLUDE_CSV_TEMPLATES),true) @$(MAKE) csv @cp -r ../../build/csv $(BUILD_CONTEXT_DIR)/ceph-csv-templates @rm $(BUILD_CONTEXT_DIR)/ceph-csv-templates/csv-gen.sh - @$(MAKE) csv-clean else mkdir $(BUILD_CONTEXT_DIR)/ceph-csv-templates @@ -123,6 +122,7 @@ csv: $(OPERATOR_SDK) $(YQv3) @echo generate csv with latest operator-sdk @mkdir -p ../../build/csv/ceph @../../build/csv/csv-gen.sh + @git restore $(MANIFESTS_DIR)/crds.yaml ../../deploy/charts/rook-ceph/templates/resources.yaml @# #adding 2>/dev/null since CI doesn't seems to be creating bundle.Dockerfile file @rm bundle.Dockerfile 2> /dev/null || true