From de5684942a2d378f352b7a74eb03758f3d04dfe7 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 26 Nov 2024 20:45:06 -0500 Subject: [PATCH 1/5] Bump kube-rbac-proxy + CI Signed-off-by: drfaust92 --- charts/kube-state-metrics/Chart.yaml | 2 +- charts/kube-state-metrics/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml index 3182e471dcdc..d9c9392db5f8 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: 5.27.0 +version: 5.27.1 appVersion: 2.14.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml index a7b2bdad64f5..79734448a4fc 100644 --- a/charts/kube-state-metrics/values.yaml +++ b/charts/kube-state-metrics/values.yaml @@ -106,7 +106,7 @@ kubeRBACProxy: image: registry: quay.io repository: brancz/kube-rbac-proxy - tag: v0.18.0 + tag: v0.18.1 sha: "" pullPolicy: IfNotPresent From 5e08bc7a0f418977fcc8e8bfcb7a10023a60f5ab Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 26 Nov 2024 20:48:55 -0500 Subject: [PATCH 2/5] Bump kube-rbac-proxy + CI Signed-off-by: drfaust92 --- charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml diff --git a/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml b/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml new file mode 100644 index 000000000000..3c73fee4e628 --- /dev/null +++ b/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml @@ -0,0 +1,2 @@ +kubeRBACProxy: + enabled: true From ed11da3b3a1945e060d73e712c8d8ac6d7e6f46f Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 26 Nov 2024 21:15:35 -0500 Subject: [PATCH 3/5] Bump kube-rbac-proxy + CI Signed-off-by: drfaust92 --- charts/kube-state-metrics/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml index 29a74b80d441..9142cb4b9ee9 100644 --- a/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/kube-state-metrics/templates/deployment.yaml @@ -111,7 +111,7 @@ spec: {{- end }} {{- if .Values.kubeRBACProxy.enabled }} - --telemetry-host=127.0.0.1 - - --telemetry-port={{ $telemetryPort }} + - --telemetry-port={{ $servicePort }} {{- else }} {{- if .Values.selfMonitor.telemetryHost }} - --telemetry-host={{ .Values.selfMonitor.telemetryHost }} From af4fbc26fb4c98e7107a7551cfc299fd62954e89 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 26 Nov 2024 21:29:16 -0500 Subject: [PATCH 4/5] Bump kube-rbac-proxy + CI Signed-off-by: drfaust92 --- charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml | 2 ++ charts/kube-state-metrics/templates/deployment.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml b/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml index 3c73fee4e628..89c36f5eca7a 100644 --- a/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml +++ b/charts/kube-state-metrics/ci/01-kube-rbac-proxy-values.yaml @@ -1,2 +1,4 @@ kubeRBACProxy: enabled: true +selfMonitor: + enabled: true diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml index 9142cb4b9ee9..29a74b80d441 100644 --- a/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/kube-state-metrics/templates/deployment.yaml @@ -111,7 +111,7 @@ spec: {{- end }} {{- if .Values.kubeRBACProxy.enabled }} - --telemetry-host=127.0.0.1 - - --telemetry-port={{ $servicePort }} + - --telemetry-port={{ $telemetryPort }} {{- else }} {{- if .Values.selfMonitor.telemetryHost }} - --telemetry-host={{ .Values.selfMonitor.telemetryHost }} From 8696aabdec1bdf9399cbff9258868b8e796c725a Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 26 Nov 2024 21:39:28 -0500 Subject: [PATCH 5/5] Bump kube-rbac-proxy + CI Signed-off-by: drfaust92 --- charts/kube-state-metrics/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-state-metrics/templates/deployment.yaml b/charts/kube-state-metrics/templates/deployment.yaml index 29a74b80d441..37ca37b4a4fd 100644 --- a/charts/kube-state-metrics/templates/deployment.yaml +++ b/charts/kube-state-metrics/templates/deployment.yaml @@ -257,7 +257,7 @@ spec: {{- .Values.kubeRBACProxy.extraArgs | toYaml | nindent 8 }} {{- end }} - --secure-listen-address=:{{ .Values.selfMonitor.telemetryPort | default 8081 }} - - --upstream=http://127.0.0.1:{{ $telemetryPort }}/ + - --upstream=http://127.0.0.1:{{ $servicePort }}/ - --proxy-endpoints-port=8889 - --config-file=/etc/kube-rbac-proxy-config/config-file.yaml volumeMounts: