-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updating sower job sa so we can add annotations without enabled "aws"… (
#242) * Updating sower job sa so we can add annotations without enabled "aws" in the global configmap. Also, adding the ability to pass in "env" values to specific jobs/deployment. Updating and adding new configurations for revproxy nginx. * version bump
- Loading branch information
1 parent
77de91a
commit 282b4f7
Showing
23 changed files
with
149 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| location /argo/ { | ||
| error_page 403 @errorworkspace; | ||
| set $authz_resource "/argo"; | ||
| set $authz_method "access"; | ||
| set $authz_service "argo"; | ||
| # be careful - sub-request runs in same context as this request | ||
| auth_request /gen3-authz; | ||
|
|
||
| set $proxy_service "argo"; | ||
| set $upstream SERVICE_URL; | ||
|
|
||
| rewrite ^/argo/(.*) /$1 break; | ||
|
|
||
| proxy_set_header Connection ''; | ||
| proxy_http_version 1.1; | ||
| chunked_transfer_encoding off; | ||
|
|
||
| proxy_pass $upstream; | ||
| } |
12 changes: 12 additions & 0 deletions
12
helm/revproxy/gen3.nginx.conf/gen3-discovery-ai-service.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| location /ai { | ||
| if ($csrf_check !~ ^ok-\S.+$) { | ||
| return 403 "failed csrf check"; | ||
| } | ||
|
|
||
| set $proxy_service "gen3-discovery-ai-service"; | ||
| set $upstream http://gen3-discovery-ai-service$des_domain; | ||
| rewrite ^/ai/(.*) /$1 break; | ||
| proxy_pass $upstream; | ||
| proxy_redirect http://$host/ https://$host/ai/; | ||
| client_max_body_size 0; | ||
| } |
12 changes: 12 additions & 0 deletions
12
helm/revproxy/gen3.nginx.conf/gen3-user-data-library-service.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| location /library { | ||
| if ($csrf_check !~ ^ok-\S.+$) { | ||
| return 403 "failed csrf check"; | ||
| } | ||
|
|
||
| set $proxy_service "gen3-user-data-library-service"; | ||
| set $upstream http://gen3-user-data-library-service$des_domain; | ||
| rewrite ^/library/(.*) /$1 break; | ||
| proxy_pass $upstream; | ||
| proxy_redirect http://$host/ https://$host/library/; | ||
| client_max_body_size 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| location /ga4gh/tes/v1/ { | ||
| if ($csrf_check !~ ^ok-\S.+$) { | ||
| return 403 "failed csrf check"; | ||
| } | ||
|
|
||
| set $proxy_service "gen3-workflow"; | ||
| set $upstream http://gen3-workflow-service.$namespace.svc.cluster.local; | ||
| proxy_pass $upstream; | ||
| } | ||
|
|
||
| location /workflows/ { | ||
| if ($csrf_check !~ ^ok-\S.+$) { | ||
| return 403 "failed csrf check"; | ||
| } | ||
|
|
||
| set $proxy_service "gen3-workflow"; | ||
| set $upstream http://gen3-workflow-service.$namespace.svc.cluster.local; | ||
| rewrite ^/workflows/(.*) /$1 break; | ||
| proxy_pass $upstream; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| location /guppy/ { | ||
| proxy_connect_timeout 600s; | ||
| proxy_send_timeout 600s; | ||
| proxy_read_timeout 600s; | ||
| send_timeout 600s; | ||
| location /guppy/ { | ||
| if ($csrf_check !~ ^ok-\S.+$) { | ||
| return 403 "failed csrf check, make sure data-portal version >= 2023.12 or >= 5.19.0"; | ||
| } | ||
|
|
||
| proxy_connect_timeout 600s; | ||
| proxy_send_timeout 600s; | ||
| proxy_read_timeout 600s; | ||
| send_timeout 600s; | ||
|
|
||
| set $proxy_service "guppy"; | ||
| # upstream is written to logs | ||
| set $upstream http://guppy-service.$namespace.svc.cluster.local; | ||
| rewrite ^/guppy/(.*) /$1 break; | ||
| proxy_pass $upstream; | ||
| client_max_body_size 0; | ||
| } | ||
| set $proxy_service "guppy"; | ||
| # upstream is written to logs | ||
| set $upstream http://guppy-service.$namespace.svc.cluster.local; | ||
| rewrite ^/guppy/(.*) /$1 break; | ||
| proxy_pass $upstream; | ||
| client_max_body_size 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.