Skip to content

Commit dad8abf

Browse files
committed
Fixed dynamic hostnames for auth tests.
1 parent 3f1c5f9 commit dad8abf

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

scripts/deploy.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,10 @@ deploy_eoapi() {
391391
HELM_CMD="$HELM_CMD --set observability.grafana.enabled=true"
392392
HELM_CMD="$HELM_CMD --set monitoring.prometheusAdapter.prometheus.url=http://$RELEASE_NAME-prometheus-server.eoapi.svc.cluster.local"
393393

394-
394+
# Set UPSTREAM_URL and OIDC_DISCOVERY_URL dynamically for stac-auth-proxy when experimental profile is used
395+
# The experimental profile enables stac-auth-proxy, so we need to set the correct service names
396+
HELM_CMD="$HELM_CMD --set stac-auth-proxy.env.UPSTREAM_URL=http://$RELEASE_NAME-stac:8080"
397+
HELM_CMD="$HELM_CMD --set stac-auth-proxy.env.OIDC_DISCOVERY_URL=http://$RELEASE_NAME-mock-oidc-server.$NAMESPACE.svc.cluster.local:8080/.well-known/openid-configuration"
395398

396399
HELM_CMD="$HELM_CMD --set eoapi-notifier.enabled=true"
397400
HELM_CMD="$HELM_CMD --set eoapi-notifier.config.sources[0].config.connection.existingSecret.name=$RELEASE_NAME-pguser-eoapi"

scripts/deployment.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ run_deployment() {
6969
helm dependency update charts/eoapi
7070

7171
local helm_cmd="helm upgrade --install $RELEASE_NAME charts/eoapi -n $NAMESPACE --create-namespace"
72+
local use_experimental=false
7273

7374
if [[ -f "charts/eoapi/profiles/experimental.yaml" ]]; then
7475
log_info "Applying experimental profile..."
7576
helm_cmd="$helm_cmd -f charts/eoapi/profiles/experimental.yaml"
77+
use_experimental=true
7678
fi
7779
if [[ -f "charts/eoapi/profiles/local/k3s.yaml" ]]; then
7880
log_info "Applying k3s local profile..."
@@ -82,6 +84,13 @@ run_deployment() {
8284
helm_cmd="$helm_cmd --set eoapi-notifier.config.sources[0].type=pgstac"
8385
helm_cmd="$helm_cmd --set eoapi-notifier.config.sources[0].config.connection.existingSecret.name=$RELEASE_NAME-pguser-eoapi"
8486

87+
# Set UPSTREAM_URL and OIDC_DISCOVERY_URL dynamically for stac-auth-proxy when experimental profile is used
88+
# The experimental profile enables stac-auth-proxy, so we need to set the correct service names
89+
if [[ "$use_experimental" == "true" ]]; then
90+
helm_cmd="$helm_cmd --set stac-auth-proxy.env.UPSTREAM_URL=http://$RELEASE_NAME-stac:8080"
91+
helm_cmd="$helm_cmd --set stac-auth-proxy.env.OIDC_DISCOVERY_URL=http://$RELEASE_NAME-mock-oidc-server.$NAMESPACE.svc.cluster.local:8080/.well-known/openid-configuration"
92+
fi
93+
8594
if is_ci; then
8695
log_info "Applying CI-specific configurations..."
8796

0 commit comments

Comments
 (0)