diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index d20937eb6f3a..819b837e9ba7 100644 --- a/charts/kube-state-metrics/Chart.yaml +++ b/charts/kube-state-metrics/Chart.yaml @@ -7,7 +7,7 @@ keywords: - prometheus - kubernetes type: application -version: 6.4.1 +version: 6.4.2 # renovate: github-releases=kubernetes/kube-state-metrics appVersion: 2.17.0 home: https://github.com/kubernetes/kube-state-metrics/ diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml index 94250924bff0..8f0fe1ed5041 100644 --- a/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/kube-state-metrics/templates/deployment.yaml @@ -61,7 +61,7 @@ spec: dnsPolicy: {{ .Values.dnsPolicy }} containers: {{- $servicePort := ternary .Values.kubeRBACProxy.port (.Values.service.port | default 8080) .Values.kubeRBACProxy.enabled}} - {{- $telemetryPort := ternary 9091 (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}} + {{- $telemetryPort := ternary .Values.kubeRBACProxy.telemetryPort (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}} - name: {{ template "kube-state-metrics.name" . }} {{- if .Values.autosharding.enabled }} env: @@ -86,7 +86,7 @@ spec: {{- if .Values.extraArgs }} {{- .Values.extraArgs | toYaml | nindent 8 }} {{- end }} - {{- if .Values.kubeRBACProxy.enabled }} + {{- if and .Values.kubeRBACProxy.enabled .Values.hostNetwork }} - --host=127.0.0.1 {{- end }} - --port={{ $servicePort }} @@ -127,7 +127,7 @@ spec: {{- if .Values.kubeconfig.enabled }} - --kubeconfig=/opt/k8s/.kube/config {{- end }} - {{- if .Values.kubeRBACProxy.enabled }} + {{- if and .Values.kubeRBACProxy.enabled .Values.hostNetwork }} - --telemetry-host=127.0.0.1 - --telemetry-port={{ $telemetryPort }} {{- else }} @@ -205,13 +205,8 @@ spec: value: {{ $header.value }} {{- end }} path: /livez - {{- if .Values.kubeRBACProxy.enabled }} - port: http - scheme: HTTPS - {{- else }} port: {{ $servicePort }} scheme: {{ upper .Values.livenessProbe.httpGet.scheme }} - {{- end }} initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} successThreshold: {{ .Values.livenessProbe.successThreshold }} @@ -228,13 +223,8 @@ spec: value: {{ $header.value }} {{- end }} path: /readyz - {{- if .Values.kubeRBACProxy.enabled }} - port: metrics - scheme: HTTPS - {{- else }} port: {{ $telemetryPort }} scheme: {{ upper .Values.readinessProbe.httpGet.scheme }} - {{- end }} initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} successThreshold: {{ .Values.readinessProbe.successThreshold }} diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml index 188d2064139a..57b74fbf2c8f 100644 --- a/charts/kube-state-metrics/values.yaml +++ b/charts/kube-state-metrics/values.yaml @@ -131,6 +131,8 @@ kubeRBACProxy: # Configure specific upstream port for kube-state-metrics container port: 9090 + # Configure specific telemetry port for kube-state-metrics container + telemetryPort: 9091 # Configure specific proxy endpoints port # This port is for healthz on readinessProbe kube-rbac-proxy-http container proxyEndpointsPort: 8888