From 9eb2574eb90eb39ca82728da339f9ff0bb5bc8e5 Mon Sep 17 00:00:00 2001
From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:57:18 +0000
Subject: [PATCH] [patch] workaround login issue with argocd v2.14.2 cli
 causing fvtsaas to fail (#1477)

---
 image/cli/mascli/functions/gitops_bootstrap | 2 +-
 image/cli/mascli/functions/gitops_utils     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/image/cli/mascli/functions/gitops_bootstrap b/image/cli/mascli/functions/gitops_bootstrap
index 8080dce3a4..6f1d0cca00 100644
--- a/image/cli/mascli/functions/gitops_bootstrap
+++ b/image/cli/mascli/functions/gitops_bootstrap
@@ -237,7 +237,7 @@ function gitops_bootstrap() {
   fi
 
   # 12. Add cluster to ARgoCD
-  argocd login ${ARGOCD_URL} --username ${ARGOCD_USERNAME} --password ${ARGOCD_PASSWORD} --insecure
+  argocd login ${ARGOCD_URL} --username ${ARGOCD_USERNAME} --password ${ARGOCD_PASSWORD} --insecure --skip-test-tls
   export K8S_AUTH_CONTEXT=$(oc whoami -c)
   argocd cluster add $K8S_AUTH_CONTEXT -y
   rc=$?
diff --git a/image/cli/mascli/functions/gitops_utils b/image/cli/mascli/functions/gitops_utils
index b44bbc13f5..48572923b8 100644
--- a/image/cli/mascli/functions/gitops_utils
+++ b/image/cli/mascli/functions/gitops_utils
@@ -723,7 +723,7 @@ function argocd_login() {
       exit 1
     fi
     echo "argo:argocd_login : ARGOCD_URL=$ARGOCD_URL ARGOCD_USERNAME=$ARGOCD_USERNAME ARGOCD_PASSWORD=${ARGOCD_PASSWORD:0:8}<snip> ..."
-    argocd login $ARGOCD_URL --username $ARGOCD_USERNAME --password $ARGOCD_PASSWORD --insecure
+    argocd login $ARGOCD_URL --username $ARGOCD_USERNAME --password $ARGOCD_PASSWORD --insecure --skip-test-tls
     return_code=$?
     echo "argo:argocd_login : return_code=$return_code"