Merge branch 'master' into chore/add-create-table-to-hatchery

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-10-26T21:32:44Z",
+  "generated_at": "2024-02-23T20:30:41Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

gen3/bin/kube-setup-argo-wrapper.sh

@@ -18,17 +18,26 @@ if [[ -z "$GEN3_SOURCE_ONLY" ]]; then
 
   gen3 roll argo-wrapper
   g3kubectl apply -f "${GEN3_HOME}/kube/services/argo-wrapper/argo-wrapper-service.yaml"
+
 
   if g3k_manifest_lookup .argo.argo_server_service_url 2> /dev/null; then
-    argo_server_service_url=$(g3k_manifest_lookup .argo.argo_server_service_url)
+    export ARGO_HOST=$(g3k_manifest_lookup .argo.argo_server_service_url)
+  else
+    export ARGO_HOST="http://argo-argo-workflows-server.argo.svc.cluster.local:2746"
+  fi 
+
+  if g3k_config_lookup '.argo_namespace' $(g3k_manifest_init)/$(g3k_hostname)/manifests/argo/argo.json 2> /dev/null; then
+    export ARGO_NAMESPACE=$(g3k_config_lookup '.argo_namespace' $(g3k_manifest_init)/$(g3k_hostname)/manifests/argo/argo.json)
+  else
+    export ARGO_NAMESPACE="argo"
+  fi
 
-    export ARGO_HOST=${argo_server_service_url}
-    export ARGO_NAMESPACE=argo-$(gen3 db namespace)
-    envsubst <"${GEN3_HOME}/kube/services/argo-wrapper/config.ini" > /tmp/config.ini
+  envsubst <"${GEN3_HOME}/kube/services/argo-wrapper/config.ini" > /tmp/config.ini
 
-    g3kubectl delete configmap argo-wrapper-namespace-config
-    g3kubectl create configmap argo-wrapper-namespace-config --from-file /tmp/config.ini
-  fi
+  g3kubectl delete configmap argo-wrapper-namespace-config
+  g3kubectl create configmap argo-wrapper-namespace-config --from-file /tmp/config.ini
+
+  rm /tmp/config.ini
 
   gen3_log_info "the argo-wrapper service has been deployed onto the kubernetes cluster"
 fi