remove metrics port

Author: Alex-Kum

charts/vaas/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vaas
-version: 3.3.0-beta.4
+version: 3.3.0-beta.5
 description: Deployment of a Verdict-as-a-Service on-premise instance
 maintainers:
   - name: G DATA CyberDefense AG

charts/vaas/templates/gateway/statefulset.yaml

@@ -80,15 +80,11 @@ spec:
             - name: ws
               containerPort: {{ .Values.gateway.service.ws.port }}
               protocol: TCP
-           {{- if .Values.gateway.metrics.enabled }}
-            - name: metrics
-              containerPort: {{ .Values.gateway.metrics.targetPort }}
-              protocol: TCP
           {{- if .Values.gateway.metrics.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
               path: {{ .Values.gateway.metrics.livenessProbe.httpGet.path }}
-              port: {{ .Values.gateway.metrics.livenessProbe.httpGet.port | default "metrics" }}
+              port: {{ .Values.gateway.metrics.livenessProbe.httpGet.port | default "http" }}
             timeoutSeconds: {{ .Values.gateway.metrics.livenessProbe.timeoutSeconds }}
             {{- with .Values.gateway.metrics.livenessProbe.initalDelaySeconds }}
             initialDelaySeconds: {{ . }}
@@ -107,7 +103,7 @@ spec:
           readinessProbe:
             httpGet:
               path: {{ .Values.gateway.metrics.readinessProbe.httpGet.path }}
-              port: {{ .Values.gateway.metrics.readinessProbe.httpGet.port | default "metrics" }}
+              port: {{ .Values.gateway.metrics.readinessProbe.httpGet.port | default "http" }}
             timeoutSeconds: {{ .Values.gateway.metrics.readinessProbe.timeoutSeconds }}
             {{- with .Values.gateway.metrics.readinessProbe.initalDelaySeconds }}
             initialDelaySeconds: {{ . }}
@@ -122,7 +118,6 @@ spec:
             failureThreshold: {{ . }}
             {{- end }}
           {{- end }}
-          {{- end }}
           resources:
             {{- toYaml .Values.gateway.resources | nindent 12 }}
       {{- with .Values.gateway.nodeSelector }}

charts/vaas/values.yaml

@@ -160,7 +160,6 @@ gateway:
 
   metrics:
     enabled: false
-    targetPort: 9110
     livenessProbe:
       enabled: true
       httpGet: