From 1aca91b20926cd0d2eb1bb9fd54276ce7a28bcdd Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 10 Mar 2020 11:21:35 +0000 Subject: [PATCH] [stable/node-problem-detector] Add custom labels to daemonset (#21334) Add the ability to use custom labels to daemonset. Signed-off-by: Markos Chandras --- stable/node-problem-detector/Chart.yaml | 2 +- stable/node-problem-detector/README.md | 1 + stable/node-problem-detector/templates/daemonset.yaml | 3 +++ stable/node-problem-detector/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/node-problem-detector/Chart.yaml b/stable/node-problem-detector/Chart.yaml index 0440fcc4c0..c2cb6584e5 100644 --- a/stable/node-problem-detector/Chart.yaml +++ b/stable/node-problem-detector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: node-problem-detector -version: "1.6.3" +version: "1.6.4" appVersion: v0.7.0 home: https://github.com/kubernetes/node-problem-detector description: Installs the node-problem-detector daemonset for monitoring extra attributes on nodes diff --git a/stable/node-problem-detector/README.md b/stable/node-problem-detector/README.md index fb14f889e8..62856f4d6a 100644 --- a/stable/node-problem-detector/README.md +++ b/stable/node-problem-detector/README.md @@ -58,6 +58,7 @@ The following table lists the configurable parameters for this chart and their d | `tolerations` | Optional daemonset tolerations | `["effect: NoSchedule,operator: Exists"]` | | `nodeSelector` | Optional daemonset nodeSelector | `{}` | | `env` | Optional daemonset environment variables | `[]` | +| `labels` | Optional daemonset labels | `{}` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` or provide a YAML file containing the values for the above parameters: diff --git a/stable/node-problem-detector/templates/daemonset.yaml b/stable/node-problem-detector/templates/daemonset.yaml index 5399cc5801..d2d79bc021 100644 --- a/stable/node-problem-detector/templates/daemonset.yaml +++ b/stable/node-problem-detector/templates/daemonset.yaml @@ -7,6 +7,9 @@ metadata: helm.sh/chart: {{ include "node-problem-detector.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- range $key, $val := .Values.labels }} + {{ $key }}: {{ $val | quote }} + {{- end}} spec: selector: matchLabels: diff --git a/stable/node-problem-detector/values.yaml b/stable/node-problem-detector/values.yaml index 5ef7e913e2..4d13bc6515 100644 --- a/stable/node-problem-detector/values.yaml +++ b/stable/node-problem-detector/values.yaml @@ -61,6 +61,8 @@ resources: {} annotations: {} +labels: {} + tolerations: - effect: NoSchedule operator: Exists