Changes for gitProxy variable in proxy.yaml file (#1047)

Author: PalashGoelIntel

installer/generate_cluster_yaml.sh

@@ -322,8 +322,16 @@ update_proxy() {
     fi
 
     export TMP_VALUE="$value"
-    echo "🛠️ Setting .argo.proxy.${yaml_key} = \"$value\""
-    yq eval -i ".argo.proxy.${yaml_key} = strenv(TMP_VALUE)" "$OUTPUT_FILE"
+    
+    # Special handling for gitProxy - update at .argo.git location
+    if [ "$yaml_key" = "gitProxy" ]; then
+        echo "🛠️ Setting .argo.git.${yaml_key} = \"$value\""
+        yq eval -i ".argo.git.${yaml_key} = strenv(TMP_VALUE)" "$OUTPUT_FILE"
+    else
+        echo "🛠️ Setting .argo.proxy.${yaml_key} = \"$value\""
+        yq eval -i ".argo.proxy.${yaml_key} = strenv(TMP_VALUE)" "$OUTPUT_FILE"
+    fi
+    
     unset TMP_VALUE
 }
 
@@ -335,6 +343,7 @@ update_proxy "enHttpsProxy" "EN_HTTPS_PROXY"
 update_proxy "enFtpProxy" "EN_FTP_PROXY"
 update_proxy "enSocksProxy" "EN_SOCKS_PROXY"
 update_proxy "enNoProxy" "EN_NO_PROXY"
+update_proxy "gitProxy" "GIT_PROXY"
 
 # -----------------------------------------------------------------------------
 # Manual review (if PROCEED != yes)

on-prem-installers/onprem/onprem.env

@@ -92,3 +92,4 @@ export EN_HTTPS_PROXY=""
 export EN_FTP_PROXY=""
 export EN_SOCKS_PROXY=""
 export EN_NO_PROXY=""
+export GIT_PROXY=""

terraform/orchestrator/main.tf

@@ -300,6 +300,7 @@ resource "null_resource" "copy_files" {
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env EN_FTP_PROXY ${var.ftp_proxy}'",
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env EN_SOCKS_PROXY ${var.socks_proxy}'",
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env EN_NO_PROXY ${var.no_proxy}'",
+      "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env GIT_PROXY ${var.git_proxy}'",
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_INT ${var.oxm_pxe_server_int}'",
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_IP ${var.oxm_pxe_server_ip}'",
       "bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_SUBNET ${var.oxm_pxe_server_subnet}'",

terraform/orchestrator/variables.tf

@@ -318,4 +318,10 @@ variable "enable_explicit_proxy" {
   type        = bool
   description = "Whether to enable explicit proxy settings for the VM."
   default     = false
+}
+
+variable "git_proxy" {
+  type        = string
+  description = "Sets the GIT_PROXY environment variable in the VM."
+  default     = ""
 }