diff --git a/charts/newrelic-logging/Chart.yaml b/charts/newrelic-logging/Chart.yaml index 79efee588..4f3adb140 100644 --- a/charts/newrelic-logging/Chart.yaml +++ b/charts/newrelic-logging/Chart.yaml @@ -15,5 +15,5 @@ keywords: - newrelic dependencies: - name: common-library - version: 1.1.1 + version: 1.1.2 repository: "https://helm-charts.newrelic.com" diff --git a/charts/newrelic-logging/templates/_helpers.tpl b/charts/newrelic-logging/templates/_helpers.tpl index d4f750582..eec47cfa1 100644 --- 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 index 875460333..76538bc53 100644 --- 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/charts/super-agent-deployment/Chart.yaml b/charts/super-agent-deployment/Chart.yaml index 1c1a0f905..03d5e1b22 100644 --- a/charts/super-agent-deployment/Chart.yaml +++ b/charts/super-agent-deployment/Chart.yaml @@ -9,7 +9,7 @@ appVersion: 0.8.0 dependencies: - name: common-library - version: 1.1.1 + version: 1.1.2 repository: https://helm-charts.newrelic.com keywords: diff --git a/charts/super-agent/Chart.yaml b/charts/super-agent/Chart.yaml index 8ef7406fa..7d5d71585 100644 --- a/charts/super-agent/Chart.yaml +++ b/charts/super-agent/Chart.yaml @@ -11,7 +11,7 @@ dependencies: version: 2.12.2 condition: flux2.enabled - name: common-library - version: 1.1.1 + version: 1.1.2 repository: https://helm-charts.newrelic.com keywords: diff --git a/library/CHART-TEMPLATE/Chart.yaml b/library/CHART-TEMPLATE/Chart.yaml index d0417252d..1fb8c7b1e 100644 --- a/library/CHART-TEMPLATE/Chart.yaml +++ b/library/CHART-TEMPLATE/Chart.yaml @@ -25,7 +25,7 @@ appVersion: "1.16.0" dependencies: - name: common-library - version: 1.1.0 + version: 1.1.2 repository: file://../common-library # We keep this as a file to test things immediately locally/in the pipeline keywords: diff --git a/library/common-library/Chart.yaml b/library/common-library/Chart.yaml index 223fcb80c..fe8603802 100644 --- 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 index 0197dd35a..9dfd9ad5d 100644 --- 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 -}}