From 41364c94a0cf2afdc1f28d4300faeea9cad8f120 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Fri, 7 Jun 2024 13:25:41 -0400 Subject: [PATCH 1/2] test(smoketest): use relative ext redirect URLs --- compose/cryostat-grafana.yml | 2 +- compose/s3-seaweed.yml | 2 +- smoketest.bash | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compose/cryostat-grafana.yml b/compose/cryostat-grafana.yml index 9703de7e6..1ae75b868 100644 --- a/compose/cryostat-grafana.yml +++ b/compose/cryostat-grafana.yml @@ -2,7 +2,7 @@ version: "3" services: cryostat: environment: - - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-http://localhost:3000/} + - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-/grafana/} - GRAFANA_DASHBOARD_URL=http://grafana:3000 grafana: image: ${GRAFANA_DASHBOARD_IMAGE:-quay.io/cryostat/cryostat-grafana-dashboard:latest} diff --git a/compose/s3-seaweed.yml b/compose/s3-seaweed.yml index ccf2c61cb..d4ef60ddd 100644 --- a/compose/s3-seaweed.yml +++ b/compose/s3-seaweed.yml @@ -8,7 +8,7 @@ services: STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8333 - STORAGE_EXT_URL: http://localhost:8080/storage/ + STORAGE_EXT_URL: /storage/ QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution QUARKUS_S3_AWS_REGION: us-east-1 QUARKUS_S3_AWS_CREDENTIALS_TYPE: static diff --git a/smoketest.bash b/smoketest.bash index 5145af5a7..d19384fae 100755 --- a/smoketest.bash +++ b/smoketest.bash @@ -101,7 +101,6 @@ if [ "${USE_PROXY}" = "true" ]; then FILES+=("${DIR}/compose/auth_proxy.yml") CRYOSTAT_HTTP_HOST=auth CRYOSTAT_HTTP_PORT=8181 - GRAFANA_DASHBOARD_EXT_URL=http://localhost:8080/grafana/ else FILES+=("${DIR}/compose/no_proxy.yml") if [ "${s3}" != "none" ]; then From 57d3d31c00179b790ac5faddf504fb5b6de06cc0 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Fri, 7 Jun 2024 14:51:00 -0400 Subject: [PATCH 2/2] fixup! test(smoketest): use relative ext redirect URLs --- compose/s3-cloudserver.yml | 2 +- compose/s3-localstack.yml | 2 +- compose/s3-minio.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/s3-cloudserver.yml b/compose/s3-cloudserver.yml index 2bb75985d..a70ed946c 100644 --- a/compose/s3-cloudserver.yml +++ b/compose/s3-cloudserver.yml @@ -7,7 +7,7 @@ services: environment: STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8000 - STORAGE_EXT_URL: http://localhost:8080/storage/ + STORAGE_EXT_URL: /storage/ QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution QUARKUS_S3_AWS_REGION: us-east-1 QUARKUS_S3_AWS_CREDENTIALS_TYPE: static diff --git a/compose/s3-localstack.yml b/compose/s3-localstack.yml index 839110b0d..ebad60540 100644 --- a/compose/s3-localstack.yml +++ b/compose/s3-localstack.yml @@ -7,7 +7,7 @@ services: environment: STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:4566 - STORAGE_EXT_URL: http://localhost:8080/storage/ + STORAGE_EXT_URL: /storage/ QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution QUARKUS_S3_AWS_REGION: us-east-1 QUARKUS_S3_AWS_CREDENTIALS_TYPE: static diff --git a/compose/s3-minio.yml b/compose/s3-minio.yml index c6885ba34..49a61ee53 100644 --- a/compose/s3-minio.yml +++ b/compose/s3-minio.yml @@ -7,7 +7,7 @@ services: environment: STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:9000 - STORAGE_EXT_URL: http://localhost:8080/storage/ + STORAGE_EXT_URL: /storage/ QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution QUARKUS_S3_AWS_REGION: us-east-1 QUARKUS_S3_AWS_CREDENTIALS_TYPE: static