[newrelic-infrastrcuture] global nrStaging (newrelic#61)

mr-smithers-excellent · Jun 10, 2020 · 9b8e4ec · 9b8e4ec
1 parent a293313
commit 9b8e4ec
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/charts/newrelic-infrastructure/Chart.yaml b/charts/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.13.38
+version: 0.14.0
 appVersion: 1.22.0
 home: https://hub.docker.com/r/newrelic/infrastructure-k8s/
 source:

diff --git a/charts/newrelic-infrastructure/README.md b/charts/newrelic-infrastructure/README.md
@@ -8,10 +8,10 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset.
 
 | Parameter                      | Description                                                                                                                                                                                                                                       | Default                   |
 | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
-| `cluster`                      | The cluster name for the Kubernetes cluster.                                                                                                                                                                                                      |                           |
-| `licenseKey`                   | The [license key](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key) for your New Relic Account. This will be preferred configuration option if both `licenseKey` and `customSecret` are specified.             |                           |
-| `customSecretName`             | Name of the Secret object where the license key is stored                                                                                                                                                                                         |                           |
-| `customSecretLicenseKey`       | Key in the Secret object where the license key is stored.                                                                                                                                                                                         |                           |
+| `global.cluster` - `cluster` | The cluster name for the Kubernetes cluster.                                                                                                                                                                                                      |                           |
+| `global.licenseKey` - `licenseKey` | The [license key](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key) for your New Relic Account. This will be preferred configuration option if both `licenseKey` and `customSecret` are specified.             |                           |
+| `global.customSecretName` - `customSecretName` | Name of the Secret object where the license key is stored                                                                                                                                                                                         |                           |
+| `global.customSecretLicenseKey` - `customSecretLicenseKey` | Key in the Secret object where the license key is stored.                                                                                                                                                                                         |                           |
 | `config`                       | A `newrelic.yml` file if you wish to provide.                                                                                                                                                                                                     |                           |
 | `integrations_config`          | List of Integrations configuration to monitor services running on Kubernetes. More information on can be found [here](https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-apps-services/monitor-services-running-kubernetes). |                           |
 | `disableKubeStateMetrics`          | Disables kube-state-metrics data parsing if the value is ` true`.                                                                                                                              |   `false`                        |
@@ -42,7 +42,7 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset.
 | `schedulerEndpointUrl`         | Explicitly sets the scheduler component url.                                                                                                                                                                                                      |                           |
 | `controllerManagerEndpointUrl` | Explicitly sets the controller manager component url.                                                                                                                                                                                             |                           |
 | `eventQueueDepth`              | Increases the in-memory cache of the agent to accommodate for more samples at a time. | |
-| `nrStaging`                    | Send data to staging (requires a staging license key). | false |
+| `global.nrStaging` - `nrStaging` | Send data to staging (requires a staging license key). | false |
 
 ## Example
 

diff --git a/charts/newrelic-infrastructure/templates/_helpers.tpl b/charts/newrelic-infrastructure/templates/_helpers.tpl
@@ -126,6 +126,13 @@ Return the customSecretLicenseKey
 {{- end -}}
 {{- end -}}
 
+{{/*
+Returns nrStaging
+*/}}
+{{- define "newrelic.nrStaging" -}}
+{{- or .Values.global.nrStaging .Values.nrStaging }}
+{{- end -}}
+
 {{/*
 Returns if the template should render, it checks if the required values
 licenseKey and cluster are set.

diff --git a/charts/newrelic-infrastructure/templates/daemonset.yaml b/charts/newrelic-infrastructure/templates/daemonset.yaml
@@ -112,7 +112,7 @@ spec:
             - name: "NRIA_EVENT_QUEUE_DEPTH"
               value: {{ .Values.eventQueueDepth | quote }}
             {{- end }}
-            {{- if .Values.nrStaging }}
+            {{- if eq (include "newrelic.nrStaging" .) "true" }}
             - name: "NRIA_STAGING"
               value: "true"
             {{- end }}

diff --git a/charts/newrelic-infrastructure/values.yaml b/charts/newrelic-infrastructure/values.yaml
@@ -145,4 +145,6 @@ etcdTlsSecretNamespace: default
 # https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-apps-services/monitor-services-running-kubernetes
 integrations_config: {}
 
+# Sends data to staging, can be set as a global.
+# global.nrStaging
 nrStaging: false