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

hotfix: attach the proxy-headers value to CANDIG_PRODUCTION_MODE #811

Merged
merged 2 commits into from
Oct 15, 2024

Conversation

daisieh
Copy link
Member

@daisieh daisieh commented Oct 11, 2024

Instead of using the env var, we can use the CLI flag when starting up in production mode.

@daisieh daisieh requested a review from SonQBChau October 11, 2024 20:53
@daisieh daisieh force-pushed the daisieh/proxy-headers branch from 3c055da to b292a0e Compare October 11, 2024 21:51
Copy link
Contributor

@SonQBChau SonQBChau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

@CourtneyGosselin CourtneyGosselin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works on BCGSC-DEV

@daisieh daisieh merged commit 8a41af7 into develop Oct 15, 2024
1 check passed
@daisieh daisieh deleted the daisieh/proxy-headers branch October 15, 2024 18:10
@daisieh daisieh restored the daisieh/proxy-headers branch October 15, 2024 18:13
@daisieh daisieh deleted the daisieh/proxy-headers branch October 15, 2024 18:19
daisieh added a commit that referenced this pull request Oct 25, 2024
* CanDIG/candig-opa merging: hotfix: site curator only relevant for curateable path/method (#798)

* updating submodules

* Update test_integration.py

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Daisie Huang <[email protected]>

* updating submodules (#802)

Co-authored-by: github-actions <[email protected]>

* update katsu

* AGGREGATE_COUNT_THRESHOLD=10

* Update opa

* updates from UHN prod

* Update candigv2-ingest

* Update katsu_service

* updating submodules (#804)

Co-authored-by: github-actions <[email protected]>

* updating submodules (#797)

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>

* remove the confusing KEYCLOAK_PUBLIC_URL_PROD var

* Some keycloak instances return a different URL for issuer

* tyk templates should use KEYCLOAK_ISSUER_URL

* Update Dockerfile

* DIG-1665: `clean` targets delete contents, not actual folders (#806)

* don't delete base folders, just their contents

* Prevent `Make clean-all` from failing when tmp/containers.txt does not exist

* Retrigger tests?

---------

Co-authored-by: fnguyen <[email protected]>

* updating submodules (#808)

Co-authored-by: github-actions <[email protected]>

* updating submodules (#809)

Co-authored-by: github-actions <[email protected]>

* updating submodules (#807)

Co-authored-by: github-actions <[email protected]>

* Update htsget_app

* Update candigv2-ingest

* Explicit error message now in keycloak_setup.sh and minor doc mods.

* updating submodules (#810)

Co-authored-by: github-actions <[email protected]>

* Update htsget_app

* update version numbers

* Silly misplaced ] in keycloak_setup.sh

* hotfix: attach the proxy-headers value to CANDIG_PRODUCTION_MODE (#811)

* attach the proxy-headers value to CANDIG_PRODUCTION_MODE

* use an env setting

* pick up daisieh/proxy-headers (#813)

* updating submodules (#814)

Co-authored-by: github-actions <[email protected]>

* set channels to conda-forge (#812)

* append listen path later

* Update federation

* update docs

* hardcode federation

* Update federation

* hotfix: hardcode "federation" as the listen path for the federation service (#816)

* append listen path later

* Update federation

* update docs

* hardcode federation

* Update federation

* FIxup federation URL

---------

Co-authored-by: fnguyen <[email protected]>

* Update federation

* Update katsu_service

* Update federation

* updating submodules (#818)

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Daisie Huang <[email protected]>

* updating submodules (#819)

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Daisie Huang <[email protected]>

* hotfix: don't check your own heartbeat; respawn on error (#821)

* pass in FEDERATION_SELF_SERVER_ID to federation

* no quotes

* Update federation

* Hotfix: no default admin (#823)

* updating submodules (#817)

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Daisie Huang <[email protected]>

* handle if default site admin not present

---------

Co-authored-by: candigbot <[email protected]>
Co-authored-by: github-actions <[email protected]>

* Update htsget_app

* Update query

* Update federation (#828)

* Update federation

* Update htsget_app

* Prod Bugs: Update Query/Data Portal/HTSGet (#832)

* Update candig-data-portal

* Update federation

* Update federation

* Update production-candig.md

* Update production-candig.md

* add FEDERATION_SELF_SERVER_ID

* katsu version bump

---------

Co-authored-by: candigbot <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: Marion <[email protected]>
Co-authored-by: fnguyen <[email protected]>
Co-authored-by: David Brownlee <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants