From cc36e1f879f7d47ed9c8ae9be855d04fc3f98449 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 22 Jan 2025 17:14:48 +0100
Subject: [PATCH 1/2] Fix argo-healthcheck target

If ACM is installed the search for `applications` matches the ACM one
and not the argo one.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 53e15d3f..fc10236e 100644
--- a/Makefile
+++ b/Makefile
@@ -193,16 +193,16 @@ validate-prereq: ## verify pre-requisites
 .PHONY: argo-healthcheck
 argo-healthcheck: ## Checks if all argo applications are synced
 	@echo "Checking argo applications"
-	$(eval APPS := $(shell oc get applications -A -o jsonpath='{range .items[*]}{@.metadata.namespace}{","}{@.metadata.name}{"\n"}{end}'))
+	$(eval APPS := $(shell oc get applications.argoproj.io -A -o jsonpath='{range .items[*]}{@.metadata.namespace}{","}{@.metadata.name}{"\n"}{end}'))
 	@NOTOK=0; \
 	for i in $(APPS); do\
 		n=`echo "$${i}" | cut -f1 -d,`;\
 		a=`echo "$${i}" | cut -f2 -d,`;\
-		STATUS=`oc get -n "$${n}" application/"$${a}" -o jsonpath='{.status.sync.status}'`;\
+		STATUS=`oc get -n "$${n}" applications.argoproj.io/"$${a}" -o jsonpath='{.status.sync.status}'`;\
 		if [[ $$STATUS != "Synced" ]]; then\
 			NOTOK=$$(( $${NOTOK} + 1));\
 		fi;\
-		HEALTH=`oc get -n "$${n}" application/"$${a}" -o jsonpath='{.status.health.status}'`;\
+		HEALTH=`oc get -n "$${n}" applications.argoproj.io/"$${a}" -o jsonpath='{.status.health.status}'`;\
 		if [[ $$HEALTH != "Healthy" ]]; then\
 			NOTOK=$$(( $${NOTOK} + 1));\
 		fi;\

From e3e7add390b9e8c071be6ea8028fd790a1f2d052 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 4 Feb 2025 21:25:55 +0100
Subject: [PATCH 2/2] Push TARGET_SITE into the in-container variables

This way we can override the TARGET_SITE when invoking pattern.sh
---
 scripts/pattern-util.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pattern-util.sh b/scripts/pattern-util.sh
index 1fcaee76..d04ea05d 100755
--- a/scripts/pattern-util.sh
+++ b/scripts/pattern-util.sh
@@ -85,6 +85,7 @@ podman run -it --rm --pull=newer \
     -e EXTRA_HELM_OPTS \
     -e EXTRA_PLAYBOOK_OPTS \
     -e TARGET_ORIGIN \
+    -e TARGET_SITE \
     -e NAME \
     -e TOKEN_SECRET \
     -e TOKEN_NAMESPACE \