From bc0d448adebc38a2727ae330d1a2d224f3df8690 Mon Sep 17 00:00:00 2001 From: Roberto Santalla Date: Tue, 24 May 2022 10:44:41 +0200 Subject: [PATCH] chart: rename kubelet- to kubelet-node- --- charts/newrelic-infrastructure/templates/kubelet/_naming.tpl | 4 ++-- charts/newrelic-infrastructure/tests/podName_test.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl b/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl index 1159a4ea3..2bca8b984 100644 --- a/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl +++ b/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl @@ -1,10 +1,10 @@ {{- /* Naming helpers*/ -}} {{- define "nriKubernetes.kubelet.fullname" -}} -{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "kubelet-scraper") -}} +{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "kubelet-node-scraper") -}} {{- end -}} {{- define "nriKubernetes.kubelet.fullname.agent" -}} -{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "kubelet-agent") -}} +{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "kubelet-node-agent") -}} {{- end -}} {{- define "nriKubernetes.kubelet.fullname.integrations" -}} diff --git a/charts/newrelic-infrastructure/tests/podName_test.yaml b/charts/newrelic-infrastructure/tests/podName_test.yaml index c9c1c5402..5e4c56fed 100644 --- a/charts/newrelic-infrastructure/tests/podName_test.yaml +++ b/charts/newrelic-infrastructure/tests/podName_test.yaml @@ -28,7 +28,7 @@ tests: template: templates/controlplane/daemonset.yaml - equal: path: metadata.name - value: RELEASE-NAME-nrk8s-kubelet-scraper + value: RELEASE-NAME-nrk8s-kubelet-node-scraper template: templates/kubelet/daemonset.yaml - it: name is overridden as expected set: @@ -46,5 +46,5 @@ tests: template: templates/controlplane/daemonset.yaml - equal: path: metadata.name - value: fno-kubelet-scraper + value: fno-kubelet-node-scraper template: templates/kubelet/daemonset.yaml