From b40adc3c7fa7bb2fc8bfe232a81859b1f04b594c Mon Sep 17 00:00:00 2001 From: Nicole Date: Tue, 30 Jan 2024 09:32:19 -0700 Subject: [PATCH 1/5] there is a missing trim for the resources on the kuberbacproxy which makes for strange spacing in the daemonset resources. This fixes that Signed-off-by: Nicole --- charts/prometheus-node-exporter/templates/daemonset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-node-exporter/templates/daemonset.yaml b/charts/prometheus-node-exporter/templates/daemonset.yaml index 70e5e55510af..8466bfa4cd08 100644 --- a/charts/prometheus-node-exporter/templates/daemonset.yaml +++ b/charts/prometheus-node-exporter/templates/daemonset.yaml @@ -222,7 +222,7 @@ spec: timeoutSeconds: 5 {{- if .Values.kubeRBACProxy.resources }} resources: - {{ toYaml .Values.kubeRBACProxy.resources | nindent 12 }} + {{- toYaml .Values.kubeRBACProxy.resources | nindent 12 }} {{- end }} {{- if .Values.terminationMessageParams.enabled }} {{- with .Values.terminationMessageParams }} From 3e0e52af553860c8f13ca11ff483d902f38f5980 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 12 Feb 2024 08:23:07 -0700 Subject: [PATCH 2/5] fixed versions Signed-off-by: Nicole --- charts/prometheus-node-exporter/Chart.yaml | 2 +- charts/prometheus-node-exporter/values.yaml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index de66c5feeba3..f6c89be3f516 100644 --- a/charts/prometheus-node-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/Chart.yaml @@ -6,7 +6,7 @@ keywords: - prometheus - exporter type: application -version: 4.30.0 +version: 4.30.1 appVersion: 1.7.0 home: https://github.com/prometheus/node_exporter/ sources: diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index ed4607da310a..c2497becd468 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -38,7 +38,7 @@ global: # Configure kube-rbac-proxy. When enabled, creates a kube-rbac-proxy to protect the node-exporter http endpoint. # The requests are served through the same service but requests are HTTPS. kubeRBACProxy: - enabled: false + enabled: true ## Set environment variables as name/value pairs env: {} # VARIABLE: value @@ -66,7 +66,8 @@ kubeRBACProxy: # Configure a hostPort. If true, hostPort will be enabled in the container and set to service.port. enableHostPort: false - resources: {} +# resources: {} + resources: # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -74,9 +75,9 @@ kubeRBACProxy: # limits: # cpu: 100m # memory: 64Mi - # requests: - # cpu: 10m - # memory: 32Mi + requests: + cpu: 10m + memory: 32Mi service: enabled: true From 046b9d0971271bbb612f315bd1710e40dc319b17 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 12 Feb 2024 08:24:20 -0700 Subject: [PATCH 3/5] disabled krp for template testing Signed-off-by: Nicole --- charts/prometheus-node-exporter/values.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index c2497becd468..e9db4df57854 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -38,7 +38,7 @@ global: # Configure kube-rbac-proxy. When enabled, creates a kube-rbac-proxy to protect the node-exporter http endpoint. # The requests are served through the same service but requests are HTTPS. kubeRBACProxy: - enabled: true + enabled: false ## Set environment variables as name/value pairs env: {} # VARIABLE: value @@ -66,8 +66,7 @@ kubeRBACProxy: # Configure a hostPort. If true, hostPort will be enabled in the container and set to service.port. enableHostPort: false -# resources: {} - resources: + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -75,9 +74,9 @@ kubeRBACProxy: # limits: # cpu: 100m # memory: 64Mi - requests: - cpu: 10m - memory: 32Mi +# requests: +# cpu: 10m +# memory: 32Mi service: enabled: true From 053b49e4f38206ff83877057117c7c74719be6b7 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 12 Feb 2024 08:25:52 -0700 Subject: [PATCH 4/5] fix spacing for example Signed-off-by: Nicole --- charts/prometheus-node-exporter/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index e9db4df57854..1103fe56fe96 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -74,9 +74,9 @@ kubeRBACProxy: # limits: # cpu: 100m # memory: 64Mi -# requests: -# cpu: 10m -# memory: 32Mi + # requests: + # cpu: 10m + # memory: 32Mi service: enabled: true From 67daa8c475d43ef114a2881a49e248e69370e542 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 12 Feb 2024 08:26:33 -0700 Subject: [PATCH 5/5] fix spacing again Signed-off-by: Nicole --- charts/prometheus-node-exporter/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml index 1103fe56fe96..ed4607da310a 100644 --- a/charts/prometheus-node-exporter/values.yaml +++ b/charts/prometheus-node-exporter/values.yaml @@ -74,9 +74,9 @@ kubeRBACProxy: # limits: # cpu: 100m # memory: 64Mi - # requests: - # cpu: 10m - # memory: 32Mi + # requests: + # cpu: 10m + # memory: 32Mi service: enabled: true