servers: use separate port for health checks

This will allow health checks to work even if the proxy protocol is enabled on the main port.
rucio · Nov 29, 2023 · e978a6f · e978a6f
1 parent 361dbf7
commit e978a6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/charts/rucio-server/Chart.yaml b/charts/rucio-server/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-server
-version: 32.0.0
+version: 33.0.0
 apiVersion: v1
 description: A Helm chart to deploy servers for Rucio
 keywords:

diff --git a/charts/rucio-server/templates/deployment.yaml b/charts/rucio-server/templates/deployment.yaml
@@ -177,6 +177,15 @@ spec:
             - name: https
               containerPort: 443
               protocol: TCP
+{{- if .Values.useSSL }}
+            - name: health
+              containerPort: 444
+              protocol: TCP
+{{- else }}
+            - name: health
+              containerPort: 81
+              protocol: TCP
+{{- end }}
 {{- if .Values.monitoring.enabled }}
             - name: metrics
               containerPort: {{ .Values.monitoring.nativeMetricsPort }}
@@ -185,23 +194,19 @@ spec:
           readinessProbe:
             httpGet:
               path: /ping
+              port: health
 {{- if .Values.useSSL }}
               scheme: HTTPS
-              port: 443
-{{- else }}
-              port: 80
 {{- end }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
           livenessProbe:
             httpGet:
               path: /ping
+              port: health
 {{- if .Values.useSSL }}
               scheme: HTTPS
-              port: 443
-{{- else }}
-              port: 80
 {{- end }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
@@ -221,11 +226,15 @@ spec:
 {{- if .Values.useSSL }}
             - name: RUCIO_ENABLE_SSL
               value: "True"
+            - name: RUCIO_HEALTH_CHECK_PORT
+              value: "444"
             - name: OPENSSL_ALLOW_PROXY_CERTS
               value: "1"
 {{- else }}
             - name: RUCIO_ENABLE_SSL
               value: "False"
+            - name: RUCIO_HEALTH_CHECK_PORT
+              value: "81"
 {{- end }}
 {{- if .Values.monitoring.enabled }}
             - name: RUCIO_METRICS_PORT