Use port names in Helm chart (#9190)

DefectDojo · Dec 22, 2023 · 55cdcbd · 55cdcbd
1 parent fbb904a
commit 55cdcbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/helm/defectdojo/templates/django-deployment.yaml b/helm/defectdojo/templates/django-deployment.yaml
@@ -109,10 +109,14 @@ spec:
         image: {{ .Values.monitoring.prometheus.image }}
         imagePullPolicy: {{ .Values.monitoring.prometheus.imagePullPolicy }}
         command: [ '/usr/bin/nginx-prometheus-exporter', '-nginx.scrape-uri', 'http://127.0.0.1:8080/nginx_status']
+        ports:
+        - name: http-metrics
+          protocol: TCP
+          containerPort: 9113
         livenessProbe:
           httpGet:
             path: /metrics
-            port: 9113
+            port: http-metrics
           periodSeconds: 20
           initialDelaySeconds: 15
           timeoutSeconds: 5
@@ -144,7 +148,7 @@ spec:
           mountPath: {{.Values.extraConfigs.DD_MEDIA_ROOT | default "/app/media" | quote }}
         {{- end }}
         ports:
-        - name: http
+        - name: http-uwsgi
           protocol: TCP
           containerPort: 8081
         {{- if .Values.django.uwsgi.enable_debug }}
@@ -207,7 +211,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /login?force_login_form&next=/
-            port: http
+            port: http-uwsgi
             httpHeaders:
             - name: Host
               value: {{ .Values.host }}

diff --git a/helm/defectdojo/templates/django-service.yaml b/helm/defectdojo/templates/django-service.yaml
@@ -25,10 +25,15 @@ spec:
     protocol: TCP
     {{- if .Values.django.nginx.tls.enabled }}
     port: 443
-    targetPort: 8443
     {{- else }}
     port: 80
-    targetPort: 8080
+    {{- end }}
+    targetPort: http
+    {{- if and .Values.monitoring.enabled .Values.monitoring.prometheus.enabled }}
+  - name: http-metrics
+    protocol: TCP
+    port: 9113
+    targetPort: http-metrics
     {{- end }}
 {{- if .Values.django.serviceType }}
   type: {{ .Values.django.serviceType }}