From 7b6517090145e93b56f5ea429573aaa5b7e93ea3 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Martinez Date: Mon, 7 Oct 2024 13:22:56 +0200 Subject: [PATCH 1/2] Update Makefile to reflect a warning if no storageclass is present --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0e040a92..e802d2ddc 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ validate-cluster: ## Do some cluster validations before installing @oc cluster-info >/dev/null && echo "OK" || (echo "Error"; exit 1) @echo -n " storageclass: " @if [ `oc get storageclass -o go-template='{{printf "%d\n" (len .items)}}'` -eq 0 ]; then\ - echo "None Found"; exit 1;\ + echo "WARNING: No storageclass found";\ else\ echo "OK";\ fi From c8c0072c79e758066e5c92887ab0cc6d783bafc1 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 9 Oct 2024 21:50:07 +0200 Subject: [PATCH 2/2] Fix iib loading playbook name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After slimming common down the playbook needs renaming because collections have slightly different naming constraints. Previous error: ❯ ./pattern.sh make load-iib make -f common/Makefile load-iib make[1]: Entering directory '/home/michele/Engineering/cloud-patterns/multicloud-gitops' ERROR! the playbook: rhvp.cluster_utils.iib-ci could not be found make[1]: *** [common/Makefile:117: load-iib] Error 1 make[1]: Leaving directory '/home/michele/Engineering/cloud-patterns/multicloud-gitops' make: *** [Makefile:12: load-iib] Error 2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0e040a92..db3c89d22 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ secrets-backend-none: ## Edits values files to remove secrets manager + ESO .PHONY: load-iib load-iib: ## CI target to install Index Image Bundles @set -e; if [ x$(INDEX_IMAGES) != x ]; then \ - ansible-playbook rhvp.cluster_utils.iib-ci; \ + ansible-playbook rhvp.cluster_utils.iib_ci; \ else \ echo "No INDEX_IMAGES defined. Bailing out"; \ exit 1; \