Merge remote-tracking branch 'common-upstream/main' into common-autom…

…atic-update
validatedpatterns · Sep 16, 2024 · fd08aa4 · fd08aa4
2 parents f17b61b + 369d693
commit fd08aa4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 151 deletions.
diff --git a/common/Makefile b/common/Makefile
@@ -169,7 +169,14 @@ validate-prereq: ## verify pre-requisites
 	  if ! ansible-galaxy collection list | grep kubernetes.core > /dev/null 2>&1; then echo "Not found"; exit 1; fi;\
 	  echo "OK";\
 	else\
-	  echo "Skipping prerequisites check as we're running inside a container";\
+		if [ -f values-global.yaml ]; then\
+			OUT=`yq -r '.main.multiSourceConfig.enabled // (.main.multiSourceConfig.enabled = "false")' values-global.yaml`;\
+			if [ "$${OUT,,}" = "false" ]; then\
+				echo "You must set \".main.multiSourceConfig.enabled: true\" in your 'values-global.yaml' file";\
+				echo "because your common subfolder is the slimmed down version with no helm charts in it";\
+				exit 1;\
+			fi;\
+		fi;\
 	fi
 
 .PHONY: argo-healthcheck

diff --git a/common/common b/common/common
diff --git a/common/operator-install/.github/workflows/update-helm-repo.yml b/common/operator-install/.github/workflows/update-helm-repo.yml
diff --git a/common/reference-output.yaml b/common/reference-output.yaml