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.

Sign up for GitHub

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

Katsu auth + move Katsu out from private portal URL #299

Draft
wants to merge 3 commits into
base: releases/v18
Choose a base branch
from
Draft

Katsu auth + move Katsu out from private portal URL #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ffbe42
Katsu auth + move Katsu out from private portal URL
davidlougheed Dec 16, 2024
e915361
Merge remote-tracking branch 'origin/releases/v18' into feat/katsu-auth
davidlougheed Jan 8, 2025
f763ce5
set beacon to pr-120
davidlougheed Jan 10, 2025
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
8 changes: 4 additions & 4 deletions etc/bento.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ BENTOV2_KATSU_DB_CPUS=4

# Katsu
BENTOV2_KATSU_IMAGE=ghcr.io/bento-platform/katsu
BENTOV2_KATSU_VERSION=9.1.0
BENTOV2_KATSU_VERSION=pr-536
BENTOV2_KATSU_VERSION_DEV=${BENTOV2_KATSU_VERSION}-dev
BENTOV2_KATSU_CONTAINER_NAME=${BENTOV2_PREFIX}-katsu
BENTO_KATSU_NETWORK=${BENTOV2_PREFIX}-katsu-net
Expand All @@ -301,7 +301,7 @@ CHORD_METADATA_SUB_PATH=/api/metadata

# Canonical/world-resolvable URL for Katsu
# TODO: services should use the service registry instead
BENTO_KATSU_URL=${BENTOV2_PORTAL_PUBLIC_URL}${CHORD_METADATA_SUB_PATH}
BENTO_KATSU_URL=${BENTOV2_PUBLIC_URL}${CHORD_METADATA_SUB_PATH}

# Redis
BENTOV2_REDIS_BASE_IMAGE=redis
Expand Down Expand Up @@ -387,7 +387,7 @@ BENTOV2_GOHAN_PRIVATE_AUTHZ_URL=http://${BENTOV2_GOHAN_AUTHZ_OPA_CONTAINER_NAME}
# Bento-Public

BENTO_PUBLIC_IMAGE=ghcr.io/bento-platform/bento_public
BENTO_PUBLIC_VERSION=edge
BENTO_PUBLIC_VERSION=pr-240
BENTO_PUBLIC_VERSION_DEV=${BENTO_PUBLIC_VERSION}-dev
BENTO_PUBLIC_CONTAINER_NAME=${BENTOV2_PREFIX}-public
BENTO_PUBLIC_NETWORK=${BENTOV2_PREFIX}-public-net
Expand All @@ -407,7 +407,7 @@ BENTO_PUBLIC_PORTAL_URL=${BENTOV2_PORTAL_PUBLIC_URL}
BENTO_BEACON_CONTAINER_NAME=${BENTOV2_PREFIX}-beacon
BENTO_BEACON_NETWORK=${BENTOV2_PREFIX}-beacon-net
BENTO_BEACON_IMAGE=ghcr.io/bento-platform/bento_beacon
BENTO_BEACON_VERSION=edge
BENTO_BEACON_VERSION=pr-120
BENTO_BEACON_VERSION_DEV=${BENTO_BEACON_VERSION}-dev
BENTO_BEACON_INTERNAL_PORT=${BENTO_STD_SERVICE_INTERNAL_PORT}
BENTO_BEACON_EXTERNAL_PORT=5000
Expand Down
2 changes: 1 addition & 1 deletion etc/bento_services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"katsu": {
"service_kind": "metadata",
"url_template": "{BENTO_PORTAL_PUBLIC_URL}/api/{service_kind}",
"url_template": "{BENTO_PUBLIC_URL}/api/{service_kind}",
"repository": "[email protected]:bento-platform/katsu.git"
},
"drs": {
Expand Down
3 changes: 1 addition & 2 deletions lib/gateway/services/katsu.conf.tpl → lib/gateway/public_services/katsu.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion lib/katsu/docker-compose.katsu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading