From b3ef3a0fa993d6ff92f298fbf186e5b3d02cd574 Mon Sep 17 00:00:00 2001 From: Hashfyre Date: Tue, 15 Jan 2019 22:39:46 +0530 Subject: [PATCH] [stable/node-problem-detector] adds custom-plugin-monitor config (#10549) * [stable/node-problem-detector] adds --custom-plugin-monitors flag Signed-off-by: Joy Bhattacherjee * [stable/node-problem-detector] adds documentation custom_plugin_monitor Signed-off-by: Joy Bhattacherjee * [stable/node-problem-detector] updates readme with correct default value for custompluginmonitor Signed-off-by: Joy Bhattacherjee * [stable/node-problem-detector] updates chart version to 1.1.3 Signed-off-by: Joy Bhattacherjee --- stable/node-problem-detector/Chart.yaml | 2 +- stable/node-problem-detector/README.md | 31 ++++++++++--------- .../templates/daemonset.yaml | 2 +- stable/node-problem-detector/values.yaml | 1 + 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/stable/node-problem-detector/Chart.yaml b/stable/node-problem-detector/Chart.yaml index 22211962becf..52add2664bf0 100644 --- a/stable/node-problem-detector/Chart.yaml +++ b/stable/node-problem-detector/Chart.yaml @@ -1,5 +1,5 @@ name: node-problem-detector -version: "1.1.2" +version: "1.1.3" appVersion: v0.6.1 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 d5133e8dbe08..28de9f1c0281 100644 --- a/stable/node-problem-detector/README.md +++ b/stable/node-problem-detector/README.md @@ -34,21 +34,22 @@ Custom System log monitor config files can be created, see [here](https://github The following table lists the configurable parameters for this chart and their default values. -| Parameter | Description | Default | -| ------------------------|--------------------------------------------|--------------------------------------------------------------| -| `affinity` | Map of node/pod affinities | `{}` | -| `annotations` | Optional daemonset annotations | `{}` | -| `fullnameOverride` | Override the fullname of the chart | `nil` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.repository` | Image | `k8s.gcr.io/node-problem-detector` | -| `image.tag` | Image tag | `v0.6.1` | -| `nameOverride` | Override the name of the chart | `nil` | -| `rbac.create` | RBAC | `true` | -| `resources` | Pod resource requests and limits | `{}` | -| `settings.log_monitors` | System log monitor config files | `/config/kernel-monitor.json`, `/config/docker-monitor.json` | -| `serviceAccount.create` | Whether a ServiceAccount should be created | `true` | -| `serviceAccount.name` | Name of the ServiceAccount to create | Generated value from template | -| `tolerations` | Optional daemonset tolerations | `[]` | +| Parameter | Description | Default | +| ----------------------------------|--------------------------------------------|--------------------------------------------------------------| +| `affinity` | Map of node/pod affinities | `{}` | +| `annotations` | Optional daemonset annotations | `{}` | +| `fullnameOverride` | Override the fullname of the chart | `nil` | +| `image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `image.repository` | Image | `k8s.gcr.io/node-problem-detector` | +| `image.tag` | Image tag | `v0.6.1` | +| `nameOverride` | Override the name of the chart | `nil` | +| `rbac.create` | RBAC | `true` | +| `resources` | Pod resource requests and limits | `{}` | +| `settings.log_monitors` | System log monitor config files | `/config/kernel-monitor.json`, `/config/docker-monitor.json` | +| `settings.custom_plugin_monitors` | Custom plugin monitor config files | `[]` | +| `serviceAccount.create` | Whether a ServiceAccount should be created | `true` | +| `serviceAccount.name` | Name of the ServiceAccount to create | Generated value from template | +| `tolerations` | Optional daemonset tolerations | `[]` | 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 8989e5dd471d..bb3a873faa46 100644 --- a/stable/node-problem-detector/templates/daemonset.yaml +++ b/stable/node-problem-detector/templates/daemonset.yaml @@ -31,7 +31,7 @@ spec: command: - "/bin/sh" - "-c" - - "exec /node-problem-detector --logtostderr --system-log-monitors={{- range $index, $monitor := .Values.settings.log_monitors }}{{if ne $index 0}},{{end}}/config/{{ $monitor }}{{- end }}" + - "exec /node-problem-detector --logtostderr --system-log-monitors={{- range $index, $monitor := .Values.settings.log_monitors }}{{if ne $index 0}},{{end}}/config/{{ $monitor }}{{- end }} {{- if .Values.settings.custom_plugin_monitors }} --custom-plugin-monitors={{- range $index, $monitor := .Values.settings.custom_plugin_monitors }}{{if ne $index 0}},{{end}}{{ $monitor }}{{- end }} {{- end }}" securityContext: privileged: true env: diff --git a/stable/node-problem-detector/values.yaml b/stable/node-problem-detector/values.yaml index 7e5c36db8b6f..dc20cce2a1f8 100644 --- a/stable/node-problem-detector/values.yaml +++ b/stable/node-problem-detector/values.yaml @@ -2,6 +2,7 @@ settings: log_monitors: - kernel-monitor.json - docker-monitor.json + custom_plugin_monitors: [] hostpath: logdir: /var/log/