Skip to content

Commit

Permalink
temp hardcoding of funnel.conf
Browse files Browse the repository at this point in the history
  • Loading branch information
paulineribeyre committed Jan 29, 2025
1 parent cbb9dfb commit 14a5c26
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions gen3/bin/kube-setup-gen3-workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,31 @@ setup_funnel_infra() {
helm repo add ohsu https://ohsu-comp-bio.github.io/helm-charts
helm repo update ohsu

# NOTE: to update once Funnel supports per-user bucket credentials
cat - > "$secretsFolder/funnel.conf" <<EOM
AmazonS3:
Key: PLACEHOLDER
Secret: PLACEHOLDER
Disabled: false
# # TODO add file below to secrets folder and don't recreate if already exists
# # NOTE: to update once Funnel supports per-user bucket credentials
# cat - > "$secretsFolder/funnel.conf" <<EOM
# AmazonS3:
# Key: PLACEHOLDER
# Secret: PLACEHOLDER
# Disabled: false

Kubernetes:
Bucket: PLACEHOLDER
Region: us-east-1
# Kubernetes:
# Bucket: PLACEHOLDER
# Region: us-east-1

Logger:
# Logging levels: debug, info, error
Level: info
EOM
# Logger:
# # Logging levels: debug, info, error
# Level: info
# EOM

namespace="$(gen3 db namespace)"
version="$(g3k_manifest_lookup .versions.funnel)"
if [ "$version" == "latest" ]; then
helm upgrade --install funnel ohsu/funnel --namespace $namespace --values "$secretsFolder/funnel.conf"
# helm upgrade --install funnel ohsu/funnel --namespace $namespace --values "$secretsFolder/funnel.conf"
helm upgrade --install funnel ohsu/funnel --namespace $namespace --values /home/pauline/funnel.conf
else
helm upgrade --install funnel ohsu/funnel --namespace $namespace --values "$secretsFolder/funnel.conf" --version $version
# helm upgrade --install funnel ohsu/funnel --namespace $namespace --values "$secretsFolder/funnel.conf" --version $version
helm upgrade --install funnel ohsu/funnel --namespace $namespace --values /home/pauline/funnel.conf --version $version
fi
}

Expand Down

0 comments on commit 14a5c26

Please sign in to comment.