[kube-state-metrics] use named port for service and probes (#6098)

Signed-off-by: drfaust92 <[email protected]>

Author: DrFaust92

charts/kube-state-metrics/Chart.yaml

@@ -7,7 +7,7 @@ keywords:
   - prometheus
   - kubernetes
 type: application
-version: 6.2.0
+version: 6.3.0
 # renovate: github-releases=kubernetes/kube-state-metrics
 appVersion: 2.17.0
 home: https://github.com/kubernetes/kube-state-metrics/

charts/kube-state-metrics/templates/deployment.yaml

@@ -162,10 +162,10 @@ spec:
         {{- if eq .Values.kubeRBACProxy.enabled false }}
         ports:
         - containerPort: {{ .Values.service.port | default 8080}}
-          name: "http"
+          name: http
         {{- if .Values.selfMonitor.enabled }}
         - containerPort: {{ $telemetryPort }}
-          name: "metrics"
+          name: metrics
         {{- end }}
         {{- end }}
         {{- if .Values.startupProbe.enabled }}
@@ -182,7 +182,7 @@ spec:
             {{- end }}
             path: /healthz
             {{- if .Values.kubeRBACProxy.enabled }}
-            port: {{ .Values.service.port | default 8080 }}
+            port: http
             scheme: HTTPS
             {{- else }}
             port: {{ $servicePort }}
@@ -206,7 +206,7 @@ spec:
             {{- end }}
             path: /livez
             {{- if .Values.kubeRBACProxy.enabled }}
-            port: {{ .Values.service.port | default 8080 }}
+            port: http
             scheme: HTTPS
             {{- else }}
             port: {{ $servicePort }}
@@ -229,7 +229,7 @@ spec:
             {{- end }}
             path: /readyz
             {{- if .Values.kubeRBACProxy.enabled }}
-            port: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+            port: metrics
             scheme: HTTPS
             {{- else }}
             port: {{ $telemetryPort }}
@@ -268,13 +268,13 @@ spec:
         image: {{ include "kubeRBACProxy.image" . }}
         ports:
           - containerPort: {{ .Values.service.port | default 8080}}
-            name: "http"
+            name: http
           - containerPort: {{ .Values.kubeRBACProxy.proxyEndpointsPort | default 8888 }}
-            name: "http-healthz"
+            name: http-healthz
         readinessProbe:
           httpGet:
             scheme: HTTPS
-            port: {{ .Values.kubeRBACProxy.proxyEndpointsPort | default 8888 }}
+            port: http-healthz
             path: /healthz
           initialDelaySeconds: 5
           timeoutSeconds: 5
@@ -309,9 +309,9 @@ spec:
         image: {{ include "kubeRBACProxy.image" . }}
         ports:
           - containerPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
-            name: "metrics"
+            name: metrics
           - containerPort: 8889
-            name: "metrics-healthz"
+            name: metrics-healthz
         readinessProbe:
           httpGet:
             scheme: HTTPS

charts/kube-state-metrics/templates/networkpolicy.yaml

@@ -22,7 +22,7 @@ spec:
   {{- else }}
     ## Allow ingress on default ports by default
   - ports:
-    - port: {{ .Values.service.port | default 8080 }}
+    - port: http
       protocol: TCP
     {{- if .Values.selfMonitor.enabled }}
     {{- $telemetryPort := ternary 9091 (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}}

charts/kube-state-metrics/templates/service.yaml

@@ -19,18 +19,18 @@ spec:
   ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }}
   {{- end }}
   ports:
-  - name: "http"
+  - name: http
     protocol: TCP
     port: {{ .Values.service.port | default 8080}}
   {{- if ( and (eq .Values.service.type "NodePort" ) (not (empty .Values.service.nodePort)) ) }}
     nodePort: {{ .Values.service.nodePort }}
   {{- end }}
-    targetPort: {{ .Values.service.port | default 8080}}
+    targetPort: http
   {{ if .Values.selfMonitor.enabled }}
-  - name: "metrics"
+  - name: metrics
     protocol: TCP
     port: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
-    targetPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+    targetPort: metrics
   {{- if ( and (eq .Values.service.type "NodePort" ) (not (empty .Values.service.nodePort)) ) }}
     nodePort: {{ .Values.selfMonitor.telemetryNodePort }}
   {{- end }}