Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PXP-8364 Fix/portal csp #1687

Merged
merged 2 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gen3/bin/kube-setup-portal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@ else
g3kubectl create secret generic portal-sponsor-config
fi

dataUploadBucketName=$(gen3 secrets decode fence-config fence-config.yaml | yq -r .DATA_UPLOAD_BUCKET)
g3kubectl apply -f "${GEN3_HOME}/kube/services/portal/portal-service.yaml"
gen3 roll portal
gen3 roll portal GEN3_DATA_UPLOAD_BUCKET $dataUploadBucketName
3 changes: 3 additions & 0 deletions kube/services/portal/portal-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ spec:
name: portal-datadog-config
key: datadog_client_token
optional: true
- name: DATA_UPLOAD_BUCKET
# S3 bucket name for data upload, for setting up CSP
GEN3_DATA_UPLOAD_BUCKET|-value: ""-|
volumeMounts:
- name: "cert-volume"
readOnly: true
Expand Down