diff --git a/etc/bento.env b/etc/bento.env index 6137d481..f1e77566 100644 --- a/etc/bento.env +++ b/etc/bento.env @@ -246,7 +246,7 @@ BENTOV2_KATSU_DB_CPUS=4 # Katsu BENTOV2_KATSU_IMAGE=ghcr.io/bento-platform/katsu -BENTOV2_KATSU_VERSION=edge +BENTOV2_KATSU_VERSION=pr-446 BENTOV2_KATSU_VERSION_DEV=${BENTOV2_KATSU_VERSION}-dev BENTOV2_KATSU_CONTAINER_NAME=${BENTOV2_PREFIX}-katsu BENTO_KATSU_NETWORK=${BENTOV2_PREFIX}-katsu-net diff --git a/etc/bento_services.json b/etc/bento_services.json index 546e0fbc..ed6b004b 100644 --- a/etc/bento_services.json +++ b/etc/bento_services.json @@ -31,7 +31,7 @@ }, "katsu": { "service_kind": "metadata", - "url_template": "{BENTO_PORTAL_PUBLIC_URL}/api/{service_kind}", + "url_template": "{BENTO_PUBLIC_URL}/api/{service_kind}", "repository": "git@github.com:bento-platform/katsu.git" }, "drs": { diff --git a/lib/aggregation/docker-compose.aggregation.yaml b/lib/aggregation/docker-compose.aggregation.yaml index 3b673e88..387d81cc 100644 --- a/lib/aggregation/docker-compose.aggregation.yaml +++ b/lib/aggregation/docker-compose.aggregation.yaml @@ -8,7 +8,7 @@ services: - BENTO_DEBUG=False - USE_GOHAN=true - CORS_ORIGINS=${BENTO_CORS_ORIGINS} - - KATSU_URL=${BENTOV2_PORTAL_PUBLIC_URL}/api/metadata/ + - KATSU_URL=${BENTOV2_PUBLIC_URL}/api/metadata/ - SERVICE_REGISTRY_URL=${BENTOV2_PUBLIC_URL}/api/service-registry/ - BENTO_AUTHZ_SERVICE_URL networks: diff --git a/lib/gateway/services/katsu.conf.tpl b/lib/gateway/public_services/katsu.conf.tpl similarity index 75% rename from lib/gateway/services/katsu.conf.tpl rename to lib/gateway/public_services/katsu.conf.tpl index 1a7bb148..27d3459f 100644 --- a/lib/gateway/services/katsu.conf.tpl +++ b/lib/gateway/public_services/katsu.conf.tpl @@ -1,9 +1,8 @@ -location /api/metadata { return 302 https://${BENTOV2_PORTAL_DOMAIN}/api/metadata/; } +location /api/metadata { return 302 https://${BENTOV2_DOMAIN}/api/metadata/; } location /api/metadata/ { # Reverse proxy settings include /gateway/conf/proxy.conf; include /gateway/conf/proxy_extra.conf; - include /gateway/conf/proxy_private.conf; # Forward request to Katsu rewrite ^ $request_uri; @@ -13,4 +12,4 @@ location /api/metadata/ { # Errors error_log /var/log/bentov2_metadata_errors.log; -} \ No newline at end of file +} diff --git a/lib/katsu/docker-compose.katsu.yaml b/lib/katsu/docker-compose.katsu.yaml index 33a9f6fc..cc456adb 100644 --- a/lib/katsu/docker-compose.katsu.yaml +++ b/lib/katsu/docker-compose.katsu.yaml @@ -15,7 +15,6 @@ services: environment: - BENTO_UID - CHORD_URL=${BENTOV2_PORTAL_PUBLIC_URL} - - CHORD_PERMISSIONS=False # Keep off since we have the proxy handling everything for now - CHORD_DEBUG=False - CHORD_METADATA_SUB_PATH - INTERNAL_PORT=${BENTOV2_KATSU_INTERNAL_PORT} @@ -28,7 +27,10 @@ services: - DJANGO_SETTINGS_MODULE=chord_metadata_service.metadata.settings - BENTOV2_PORTAL_DOMAIN # Allow access by container name or localhost for healthchecks: - - KATSU_ALLOWED_HOSTS=${BENTOV2_KATSU_CONTAINER_NAME},localhost + - KATSU_ALLOWED_HOSTS=${BENTOV2_DOMAIN},${BENTOV2_KATSU_CONTAINER_NAME},localhost + # Authz + - BENTO_AUTHZ_ENABLED=True + - BENTO_AUTHZ_SERVICE_URL # configs: # - source: chord-metadata-settings # target: /katsu/metadata/settings.py diff --git a/lib/wes/docker-compose.wes.yaml b/lib/wes/docker-compose.wes.yaml index a64310d7..fd5580f8 100644 --- a/lib/wes/docker-compose.wes.yaml +++ b/lib/wes/docker-compose.wes.yaml @@ -26,7 +26,7 @@ services: # Service URLS - DRS_URL=${BENTOV2_PUBLIC_URL}/api/drs - GOHAN_URL=${BENTOV2_PORTAL_PUBLIC_URL}/api/gohan - - KATSU_URL=${BENTOV2_PORTAL_PUBLIC_URL}/api/metadata + - KATSU_URL=${BENTOV2_PUBLIC_URL}/api/metadata - BENTO_AUTHZ_SERVICE_URL - SERVICE_REGISTRY_URL=${BENTOV2_PUBLIC_URL}/api/service-registry