I think we can't use echo in gen3 scripts

uc-cdis · Feb 22, 2024 · 5f6dc89 · 5f6dc89
1 parent 1b9273d
commit 5f6dc89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-02-22T20:11:59Z",
+  "generated_at": "2024-02-22T20:13:40Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -342,7 +342,7 @@
         "hashed_secret": "40304f287a52d99fdbe086ad19dbdbf9cc1b3897",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 207,
+        "line_number": 206,
         "type": "Secret Keyword"
       }
     ],

diff --git a/gen3/bin/kube-setup-argo.sh b/gen3/bin/kube-setup-argo.sh
@@ -11,7 +11,6 @@ force=false
 for arg in "${@}"; do
   if [ "$arg" == "--override-namespace" ]; then
     override_namespace=true
-    echo "$override_namespace"
   elif [ "$arg" == "--force" ]; then
     force=true
   else 
@@ -215,7 +214,7 @@ function setup_argo_db() {
 }
 
 function setup_argo_template_secret() {
-  echo "Started the template secret process"
+  gen3_log_info "Started the template secret process"
   downloadable_bucket_name=$(g3k_config_lookup '.downloadable-s3-bucket' $(g3k_manifest_init)/$(g3k_hostname)/manifests/argo/argo.json)
   # Check if the secret already exists
     if [[ ! -z $(g3kubectl get secret argo-template-values-secret -n $argo_namespace) ]]; then
@@ -227,10 +226,10 @@ function setup_argo_template_secret() {
 }
 
 setup_argo_buckets
-echo "$override_namespace"
+gen3_log_info "$override_namespace"
 # only do this if we are running in the default namespace
 if [[ "$ctxNamespace" == "default" || "$ctxNamespace" == "null" || "$override_namespace" == true ]]; then
-  echo "Overrode namespace"
+  gen3_log_info "Overrode namespace"
   setup_argo_db
   setup_argo_template_secret 
   if (! helm status argo -n $argo_namespace > /dev/null 2>&1 )  || [[ "$force" == true ]]; then