feat: added support for templated cluster name value

newrelic · Feb 19, 2024 · a46b770 · a46b770
1 parent 66b6f48
commit a46b770
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/charts/newrelic-logging/Chart.yaml b/charts/newrelic-logging/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers
 name: newrelic-logging
-version: 1.20.2
+version: 1.20.3
 appVersion: 1.19.0
 home: https://github.com/newrelic/kubernetes-logging
 icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg

diff --git a/charts/newrelic-logging/templates/_helpers.tpl b/charts/newrelic-logging/templates/_helpers.tpl
@@ -63,15 +63,7 @@ Return the licenseKey
 Return the cluster name
 */}}
 {{- define "newrelic-logging.cluster" -}}
-{{- if .Values.global}}
-  {{- if .Values.global.cluster }}
-    {{- .Values.global.cluster -}}
-  {{- else -}}
-    {{- .Values.cluster | default "" -}}
-  {{- end -}}
-{{- else -}}
-    {{- .Values.cluster | default "" -}}
-{{- end -}}
+{{ tpl (.Values.cluster | default .Values.global.cluster | default "") . }}
 {{- end -}}
 
 {{/*

diff --git a/charts/nri-bundle/Chart.yaml b/charts/nri-bundle/Chart.yaml
@@ -57,7 +57,7 @@ dependencies:
   - name: newrelic-logging
     repository: https://newrelic.github.io/helm-charts
     condition: logging.enabled,newrelic-logging.enabled
-    version: 1.20.2
+    version: 1.20.3
 
   - name: newrelic-pixie
     repository: https://newrelic.github.io/helm-charts

diff --git a/library/common-library/Chart.yaml b/library/common-library/Chart.yaml
@@ -3,7 +3,7 @@ name: common-library
 description: Provides helpers to provide consistency on all the charts
 
 type: library
-version: 1.1.1
+version: 1.1.2
 
 keywords:
   - newrelic

diff --git a/library/common-library/templates/_cluster.tpl b/library/common-library/templates/_cluster.tpl
@@ -6,9 +6,9 @@ Return the cluster
 {{- $global := index .Values "global" | default dict -}}
 
 {{- if .Values.cluster -}}
-    {{- .Values.cluster -}}
+    {{- tpl .Values.cluster . -}}
 {{- else if $global.cluster -}}
-    {{- $global.cluster -}}
+    {{- tpl $global.cluster . -}}
 {{- else -}}
     {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
 {{- end -}}