From 755ad2449e63b970f9a68a2af352b0bf2bfac643 Mon Sep 17 00:00:00 2001 From: Tigran Mkrtchyan Date: Wed, 30 Aug 2023 10:47:02 +0200 Subject: [PATCH] add grid-ftp door and port range --- templates/configmap.yaml | 7 +++++++ templates/pool-svc.yaml | 7 +++++++ values.yaml | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/templates/configmap.yaml b/templates/configmap.yaml index 3fadd07..88cabbc 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -75,6 +75,10 @@ data: [{{ $.Release.Name }}-door-svc/dcap] dcap.authn.protocol = gsi + + [{{ $.Release.Name }}-door-svc/ftp] + ftp.authn.protocol = gsi + {{- range .Values.dcache.pools }} config-pool-{{ . }}: |- dcache.broker.scheme = satellite @@ -116,6 +120,9 @@ data: #webdav.redirect.allow-https=false #pool.enable.encrypted-transfers=false + dcache.net.wan.port.min={{ $.Values.mover.wan_range_min }} + dcache.net.wan.port.max={{ $.Values.mover.wan_range_max }} + 00-init.sh: |- export JAVA=/usr/bin/java /opt/dcache/bin/dcache database update diff --git a/templates/pool-svc.yaml b/templates/pool-svc.yaml index ea64e99..38e5608 100644 --- a/templates/pool-svc.yaml +++ b/templates/pool-svc.yaml @@ -22,5 +22,12 @@ spec: - name: https-mover port: {{ $.Values.mover.https }} targetPort: {{ $.Values.mover.https }} + {{ $range_start := ( $.Values.mover.wan_range_min | int) }} + {{ $range_stop := ( $.Values.mover.wan_range_max | int) }} + {{- range $port_index, $port := untilStep $range_start $range_stop 1 }} + - name: wan-port-{{ $port_index }} + port: {{ $port }} + targetPort: {{ $port }} + {{- end }} --- {{- end }} diff --git a/values.yaml b/values.yaml index 18a90d3..9d6e464 100644 --- a/values.yaml +++ b/values.yaml @@ -34,4 +34,6 @@ mover: nfs: 32049 xrootd: 31094 http: 38080 - https: 38083 \ No newline at end of file + https: 38083 + wan_range_min: 28000 + wan_range_max: 28050 \ No newline at end of file