Skip to content

Commit cc91fc5

Browse files
feat: auto-expose admin dashboard on cluster up
Port-forward s3proxy admin dashboard automatically when the e2e cluster starts, so operators can go straight to http://localhost:4433/admin/ without running a separate command.
1 parent 1a48631 commit cc91fc5

File tree

4 files changed

+19
-1
lines changed

4 files changed

+19
-1
lines changed

chart/templates/configmap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ data:
1717
S3PROXY_REDIS_URL: {{ .Values.externalRedis.url | quote }}
1818
{{- end }}
1919
S3PROXY_REDIS_UPLOAD_TTL_HOURS: {{ .Values.externalRedis.uploadTtlHours | quote }}
20+
S3PROXY_ADMIN_UI: {{ .Values.admin.enabled | quote }}
21+
S3PROXY_ADMIN_PATH: {{ .Values.admin.path | quote }}
2022
S3PROXY_LOG_LEVEL: {{ .Values.logLevel | quote }}

chart/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ secrets:
9595
awsAccessKeyId: ""
9696
awsSecretAccessKey: ""
9797

98+
admin:
99+
enabled: false
100+
path: "/admin"
101+
98102
logLevel: "DEBUG"
99103

100104
resources:

e2e/cluster.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ case "${1:-help}" in
2323
echo "=========================================="
2424
echo "Cluster is running in background."
2525
echo ""
26+
echo "Admin dashboard: http://localhost:4433/admin/"
27+
echo "Login: minioadmin / minioadmin"
28+
echo ""
2629
echo "Run tests:"
2730
echo " ./cluster.sh postgres"
2831
echo " ./cluster.sh elasticsearch"

e2e/docker-compose.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ services:
1818
privileged: true
1919
depends_on:
2020
- registry
21+
ports:
22+
- "4433:4433"
2123
volumes:
2224
- /var/run/docker.sock:/var/run/docker.sock
2325
- ..:/repo
@@ -437,7 +439,8 @@ services:
437439
--set redis-ha.haproxy.checkInterval=5s \
438440
--set redis-ha.haproxy.timeout.check=10s \
439441
--set redis-ha.haproxy.timeout.server=60s \
440-
--set redis-ha.haproxy.timeout.client=60s &
442+
--set redis-ha.haproxy.timeout.client=60s \
443+
--set admin.enabled=true &
441444
S3PROXY_PID=$$!
442445
443446
# 8. Wait for ALL parallel tasks
@@ -464,11 +467,17 @@ services:
464467
echo "S3 Proxy endpoint for databases: http://s3-gateway.s3proxy.svc.cluster.local:80"
465468
echo "Direct MinIO (unencrypted): http://minio.minio.svc.cluster.local:9000"
466469
470+
# Start admin dashboard port-forward in background
471+
kubectl port-forward --address 0.0.0.0 svc/s3proxy-python 4433:4433 -n s3proxy &
472+
467473
echo ""
468474
echo "=========================================="
469475
echo "Cluster is ready"
470476
echo "=========================================="
471477
echo ""
478+
echo "Admin dashboard: http://localhost:4433/admin/"
479+
echo "Login: minioadmin / minioadmin"
480+
echo ""
472481
echo "Run database tests with:"
473482
echo " ./cluster.sh postgres"
474483
echo " ./cluster.sh elasticsearch"

0 commit comments

Comments
 (0)