clean up

uc-cdis · Nov 12, 2024 · 44d80c1 · 44d80c1
1 parent 04bd6b7
commit 44d80c1
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 239 deletions.
diff --git a/gen3/bin/kube-setup-gen3-workflow.sh b/gen3/bin/kube-setup-gen3-workflow.sh
@@ -43,8 +43,6 @@ if g3k_manifest_lookup .versions.funnel 2> /dev/null; then
     gen3_log_err "kube-setup-gen3-workflow bailing out - failed to set up funnel infrastructure"
     exit 1
   fi
-  gen3 roll funnel
-  g3kubectl apply -f "${GEN3_HOME}/kube/services/funnel/funnel-service.yml"
   gen3_log_info "The funnel service has been deployed onto the kubernetes cluster."
 else
   gen3_log_warn "not deploying funnel - no manifest entry for .versions.funnel. The gen3-workflow service may not work!"

diff --git a/gen3/bin/s3.sh b/gen3/bin/s3.sh
@@ -175,7 +175,7 @@ gen3_s3_info() {
     return 1
   fi
 
-  if [[ $(_bucket_exists $bucketName) -ne 0 ]]; then
+  if [[ $(_bucket_exists $1) -ne 0 ]]; then
     gen3_log_err "Bucket '$1' does not exist"
     return 1
   fi

diff --git a/kube/services/funnel/funnel-deploy.yaml b/kube/services/funnel/funnel-deploy.yaml
diff --git a/kube/services/funnel/funnel-server-config.yml b/kube/services/funnel/funnel-server-config.yml
diff --git a/kube/services/funnel/funnel-service.yml b/kube/services/funnel/funnel-service.yml
diff --git a/kube/services/funnel/funnel-worker-config.yml b/kube/services/funnel/funnel-worker-config.yml
diff --git a/kube/services/funnel/pvc.yml b/kube/services/funnel/pvc.yml
diff --git a/kube/services/funnel/role-binding.yml b/kube/services/funnel/role-binding.yml
diff --git a/kube/services/funnel/role.yml b/kube/services/funnel/role.yml
diff --git a/kube/services/revproxy/gen3.nginx.conf/gen3-workflow-service.conf b/kube/services/revproxy/gen3.nginx.conf/gen3-workflow-service.conf
@@ -5,7 +5,6 @@ location /ga4gh/tes/v1/ {
 
     set $proxy_service "gen3-workflow";
     set $upstream http://gen3-workflow-service.$namespace.svc.cluster.local;
-    rewrite ^/ga4gh/tes/v1/(.*) /$1 break;
     proxy_pass $upstream;
 }