From 57a6a7283c97d10d8888b30415638537d0d6559b Mon Sep 17 00:00:00 2001
From: juvdiaz <juvenal.diaz@oracle.com>
Date: Tue, 2 Jun 2026 16:44:42 -0600
Subject: [PATCH] Fix Argo CD Gitea SSH access

---
 bootstrap/apps/variables.tf     |  2 +-
 bootstrap/platform/main.tf      | 13 ++++++++++---
 bootstrap/platform/variables.tf |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bootstrap/apps/variables.tf b/bootstrap/apps/variables.tf
index ffa8ed6..6a0bb9e 100644
--- a/bootstrap/apps/variables.tf
+++ b/bootstrap/apps/variables.tf
@@ -10,7 +10,7 @@ variable "argocd_namespace" {
 
 variable "gitops_repo_url" {
   type    = string
-  default = "ssh://192.168.100.89:32222/jv/my-homelab-configs.git"
+  default = "ssh://git@192.168.100.89:32222/jv/my-homelab-configs.git"
 }
 
 variable "website_image_ref" {
diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf
index 75335e7..cb57117 100644
--- a/bootstrap/platform/main.tf
+++ b/bootstrap/platform/main.tf
@@ -1014,7 +1014,11 @@ repo_target="$${repo_url#ssh://}"
 repo_target="$${repo_target#*@}"
 repo_target="$${repo_target%%/*}"
 repo_host="$${repo_target%%:*}"
-if [ -z "$${repo_host}" ]; then
+repo_port="$${repo_target#*:}"
+if [ "$${repo_port}" = "$${repo_target}" ]; then
+  repo_port="22"
+fi
+if [ -z "$${repo_host}" ] || [ -z "$${repo_port}" ]; then
   echo "Could not determine GitOps SSH host from $${repo_url}" >&2
   exit 1
 fi
@@ -1025,7 +1029,11 @@ trap 'rm -f "$${known_hosts_file}" "$${known_hosts_sorted}"' EXIT
 
 kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n "${self.triggers.namespace}" get configmap argocd-ssh-known-hosts-cm \
   -o jsonpath='{.data.ssh_known_hosts}' > "$${known_hosts_file}" 2>/dev/null || true
-ssh-keyscan -H "$${repo_host}" >> "$${known_hosts_file}" 2>/dev/null
+if [ "$${repo_port}" = "22" ]; then
+  ssh-keyscan -H "$${repo_host}" >> "$${known_hosts_file}" 2>/dev/null
+else
+  ssh-keyscan -H -p "$${repo_port}" "$${repo_host}" >> "$${known_hosts_file}" 2>/dev/null
+fi
 sort -u "$${known_hosts_file}" > "$${known_hosts_sorted}"
 kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n "${self.triggers.namespace}" create configmap argocd-ssh-known-hosts-cm \
   --from-file=ssh_known_hosts="$${known_hosts_sorted}" \
@@ -1555,4 +1563,3 @@ resource "helm_release" "extra_tools" {
     }
   }
 }
-
diff --git a/bootstrap/platform/variables.tf b/bootstrap/platform/variables.tf
index 216f309..f64501a 100644
--- a/bootstrap/platform/variables.tf
+++ b/bootstrap/platform/variables.tf
@@ -20,7 +20,7 @@ variable "calico_operator_node_name" {
 
 variable "gitops_repo_url" {
   type    = string
-  default = "ssh://192.168.100.89:32222/jv/my-homelab-configs.git"
+  default = "ssh://git@192.168.100.89:32222/jv/my-homelab-configs.git"
 }
 
 variable "gitops_ssh_key_path" {