From ef7f85928e6af5645abc07aaa79246d920b8a649 Mon Sep 17 00:00:00 2001 From: cmalson Date: Mon, 29 Jun 2026 08:35:22 -0700 Subject: [PATCH 1/2] testing user filtering --- devplanetv2/dev-environments/qa-vectis/values/jeg-values.yaml | 2 +- .../qa-vectis/values/workspace-proxy-values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devplanetv2/dev-environments/qa-vectis/values/jeg-values.yaml b/devplanetv2/dev-environments/qa-vectis/values/jeg-values.yaml index 08a7401e..9795ee2c 100644 --- a/devplanetv2/dev-environments/qa-vectis/values/jeg-values.yaml +++ b/devplanetv2/dev-environments/qa-vectis/values/jeg-values.yaml @@ -8,7 +8,7 @@ jeg: image: repository: quay.io/cdis/gen3-vectis - tag: "qa-jeg" + tag: "qa-jegv2" pullPolicy: Always env: diff --git a/devplanetv2/dev-environments/qa-vectis/values/workspace-proxy-values.yaml b/devplanetv2/dev-environments/qa-vectis/values/workspace-proxy-values.yaml index 87236523..e866cd9c 100644 --- a/devplanetv2/dev-environments/qa-vectis/values/workspace-proxy-values.yaml +++ b/devplanetv2/dev-environments/qa-vectis/values/workspace-proxy-values.yaml @@ -13,8 +13,8 @@ workspace-proxy: replicaCount: 1 image: - repository: quay.io/cdis/gen3-vectis - tag: qa-goproxy + repository: quay.io/cdis/multihead-workspace-proxy + tag: feat_init-jeg-user-ownership-fix pullPolicy: Always listenAddr: ":8080" From ab970b04714ee7fb4fd3553ac61b686bd04bc3f1 Mon Sep 17 00:00:00 2001 From: cmalson Date: Mon, 29 Jun 2026 08:35:53 -0700 Subject: [PATCH 2/2] fixing Cors issue --- .../qa-vectis/values/values.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/devplanetv2/dev-environments/qa-vectis/values/values.yaml b/devplanetv2/dev-environments/qa-vectis/values/values.yaml index 5ca8d6be..25204f0d 100644 --- a/devplanetv2/dev-environments/qa-vectis/values/values.yaml +++ b/devplanetv2/dev-environments/qa-vectis/values/values.yaml @@ -485,6 +485,16 @@ revproxy: client_max_body_size 0; } location /api/v0/submission/vectis/ { + if ($request_method = 'OPTIONS') { + add_header Access-Control-Allow-Origin $http_origin always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Methods "GET, POST, OPTIONS" always; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, Accept, X-CSRFToken, X-Requested-With" always; + add_header Access-Control-Max-Age 86400 always; + add_header Content-Length 0; + add_header Content-Type text/plain; + return 204; + } # Bypass VPC Private DNS for execute-api; resolve through public resolvers. proxy_set_header Authorization "$access_token"; proxy_ssl_server_name on; @@ -515,6 +525,16 @@ revproxy: client_max_body_size 0; } location /api/v0/submission/ { + if ($request_method = 'OPTIONS') { + add_header Access-Control-Allow-Origin $http_origin always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Methods "GET, POST, OPTIONS" always; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, Accept, X-CSRFToken, X-Requested-With" always; + add_header Access-Control-Max-Age 86400 always; + add_header Content-Length 0; + add_header Content-Type text/plain; + return 204; + } # Bypass VPC Private DNS for execute-api; resolve through public resolvers. proxy_set_header Authorization "$access_token"; proxy_ssl_server_name on; @@ -1141,6 +1161,16 @@ workspace-proxy: - "172.27.136.0/22" # EKS private subnet (DHCP) - "172.27.132.0/22" # EKS private subnet (DHCP) + # AmazonMQ broker ENI CIDRs in VPC. Prefer /32 broker ENIs when available. + amazonMqCIDRs: + - "172.27.140.0/22" + - "172.27.136.0/22" + - "172.27.132.0/22" + + amazonMqPorts: + - 5671 + - 61617 + replicaCount: 1 image: