From b458e05b3896409e950f1422cc542bdad5eb6893 Mon Sep 17 00:00:00 2001 From: Jon Bardin Date: Wed, 28 Feb 2018 10:54:48 -0800 Subject: [PATCH] Add toleration values to newrelic infra chart (#3887) * allow daemonset tolerations to be set via values * Add docs for toleration support * values must be an empty array * bump chart version as required * rename values parameter to better align with other charts * reformat text to display better in plain mode --- stable/newrelic-infrastructure/Chart.yaml | 2 +- stable/newrelic-infrastructure/README.md | 19 ++++++++++--------- .../templates/daemonset.yaml | 4 ++++ stable/newrelic-infrastructure/values.yaml | 2 ++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/stable/newrelic-infrastructure/Chart.yaml b/stable/newrelic-infrastructure/Chart.yaml index 15609c8d8e..cf43579dfb 100644 --- a/stable/newrelic-infrastructure/Chart.yaml +++ b/stable/newrelic-infrastructure/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to deploy the New Relic Infrastructure Agent as a DaemonSet name: newrelic-infrastructure -version: 0.0.1 +version: 0.0.2 appVersion: 0.0.12 home: https://hub.docker.com/r/newrelic/infrastructure/ source: diff --git a/stable/newrelic-infrastructure/README.md b/stable/newrelic-infrastructure/README.md index f8f534058b..3bb44bee7f 100644 --- a/stable/newrelic-infrastructure/README.md +++ b/stable/newrelic-infrastructure/README.md @@ -6,15 +6,16 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset. ## Configuration -| Parameter | Description | Default | -| ------------------ | --------------------------------------------------- | -------------------------- | -| `config` | A `newrelic-infra.yml` file if you wish to provide. | ` ` | -| `image.name` | The container to pull. | `newrelic/infrastructure` | -| `image.pullPolicy` | The pull policy. | `IfNotPresent` | -| `image.tag` | The version of the container to pull. | `0.0.11` | -| `licenseKey` | The license key for your New Relic Account. | `` | -| `resources` | Any resources you wish to assign to the pod. | See Resources below | -| `verboseLog` | Should the agent log verbosely. (Boolean) | `false` | +| Parameter | Description | Default | +| ------------------ | ------------------------------------------------------------ | -------------------------- | +| `config` | A `newrelic-infra.yml` file if you wish to provide. | ` ` | +| `image.name` | The container to pull. | `newrelic/infrastructure` | +| `image.pullPolicy` | The pull policy. | `IfNotPresent` | +| `image.tag` | The version of the container to pull. | `0.0.11` | +| `licenseKey` | The license key for your New Relic Account. | `` | +| `resources` | Any resources you wish to assign to the pod. | See Resources below | +| `verboseLog` | Should the agent log verbosely. (Boolean) | `false` | +| `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil` | ## Resources diff --git a/stable/newrelic-infrastructure/templates/daemonset.yaml b/stable/newrelic-infrastructure/templates/daemonset.yaml index 4330981cc7..99d719b190 100644 --- a/stable/newrelic-infrastructure/templates/daemonset.yaml +++ b/stable/newrelic-infrastructure/templates/daemonset.yaml @@ -84,4 +84,8 @@ spec: - key: newrelic-infra.yml path: newrelic-infra.yml {{- end }} + {{- if .Values.tolerations }} + tolerations: +{{ toYaml .Values.tolerations | indent 8 }} + {{- end }} {{- end }} diff --git a/stable/newrelic-infrastructure/values.yaml b/stable/newrelic-infrastructure/values.yaml index 89d43194f7..1834301f94 100644 --- a/stable/newrelic-infrastructure/values.yaml +++ b/stable/newrelic-infrastructure/values.yaml @@ -62,3 +62,5 @@ resources: # service: login service # team: alpha-team # + +tolerations: []