[newrelic-infrastructure] Fixes bug with nrStaging (#66)

Fixes bug with nrStaging when there is no global set. I missed this because I was doing my tests using --set global.licenseKey=zxc which hid the bug.
newrelic · Jun 11, 2020 · 3528bd6 · 3528bd6
1 parent 366f5e7
commit 3528bd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 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.14.0
+version: 0.14.1
 appVersion: 1.22.0
 home: https://hub.docker.com/r/newrelic/infrastructure-k8s/
 source:

diff --git a/charts/newrelic-infrastructure/templates/_helpers.tpl b/charts/newrelic-infrastructure/templates/_helpers.tpl
@@ -130,7 +130,13 @@ Return the customSecretLicenseKey
 Returns nrStaging
 */}}
 {{- define "newrelic.nrStaging" -}}
-{{- or .Values.global.nrStaging .Values.nrStaging }}
+{{- if .Values.global }}
+  {{- if .Values.global.nrStaging }}
+    {{- .Values.global.nrStaging -}}
+  {{- end -}}
+{{- else if .Values.nrStaging }}
+  {{- .Values.nrStaging -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

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 eq (include "newrelic.nrStaging" .) "true" }}
+            {{- if (include "newrelic.nrStaging" .) }}
             - name: "NRIA_STAGING"
               value: "true"
             {{- end }}