diff --git a/gen3/bin/kube-setup-gen3-workflow.sh b/gen3/bin/kube-setup-gen3-workflow.sh index a302b7705..26a9b9360 100644 --- a/gen3/bin/kube-setup-gen3-workflow.sh +++ b/gen3/bin/kube-setup-gen3-workflow.sh @@ -8,7 +8,11 @@ setup_funnel_infra() { namespace="$(gen3 db namespace)" version="$(g3k_manifest_lookup .versions.funnel)" - helm upgrade --install funnel ohsu/funnel --namespace $namespace --version $version + if [ "$version" == "latest" ]; then + helm upgrade --install funnel ohsu/funnel --namespace $namespace + else + helm upgrade --install funnel ohsu/funnel --namespace $namespace --version $version + fi # NOTE: this config is needed until funnel supports per-user buckets: # funnel.conf diff --git a/kube/services/gen3-workflow/gen3-workflow-deploy.yaml b/kube/services/gen3-workflow/gen3-workflow-deploy.yaml index 610ceefc8..f3d1255c3 100644 --- a/kube/services/gen3-workflow/gen3-workflow-deploy.yaml +++ b/kube/services/gen3-workflow/gen3-workflow-deploy.yaml @@ -93,9 +93,9 @@ spec: resources: requests: cpu: 100m - memory: 100Mi + memory: 1Gi limits: - memory: 300Mi + memory: 1Gi # initContainers: # - name: gen3-workflow-db-migrate # GEN3_REQUESTOR_IMAGE