From 8baf248b7dd08cc12418c5e79d13ed66d839d034 Mon Sep 17 00:00:00 2001 From: "felix.phipps" Date: Mon, 27 Apr 2026 16:29:42 +0100 Subject: [PATCH 1/4] initial commit Signed-off-by: felix.phipps --- deploy/charts/disco-agent/templates/_helpers.tpl | 2 +- deploy/charts/disco-agent/templates/deployment.yaml | 2 +- deploy/charts/discovery-agent/templates/_helpers.tpl | 2 +- deploy/charts/discovery-agent/templates/deployment.yaml | 2 +- deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl | 2 +- deploy/charts/venafi-kubernetes-agent/templates/deployment.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/charts/disco-agent/templates/_helpers.tpl b/deploy/charts/disco-agent/templates/_helpers.tpl index b38cb1b8..7dfb97b9 100644 --- a/deploy/charts/disco-agent/templates/_helpers.tpl +++ b/deploy/charts/disco-agent/templates/_helpers.tpl @@ -65,7 +65,7 @@ Create the name of the service account to use Util function for generating an image reference based on the provided options. This function is derived from similar functions used in the cert-manager GitHub organization */}} -{{- define "image" -}} +{{- define "disco-agent.image" -}} {{- /* Calling convention: - (tuple ) diff --git a/deploy/charts/disco-agent/templates/deployment.yaml b/deploy/charts/disco-agent/templates/deployment.yaml index e640bf4d..0c98b9a5 100644 --- a/deploy/charts/disco-agent/templates/deployment.yaml +++ b/deploy/charts/disco-agent/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} - image: "{{ template "image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" + image: "{{ template "disco-agent.image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: POD_NAMESPACE diff --git a/deploy/charts/discovery-agent/templates/_helpers.tpl b/deploy/charts/discovery-agent/templates/_helpers.tpl index ad972b80..f804b258 100644 --- a/deploy/charts/discovery-agent/templates/_helpers.tpl +++ b/deploy/charts/discovery-agent/templates/_helpers.tpl @@ -65,7 +65,7 @@ Create the name of the service account to use Util function for generating an image reference based on the provided options. This function is derived from similar functions used in the cert-manager GitHub organization */}} -{{- define "image" -}} +{{- define "discovery-agent.image" -}} {{- /* Calling convention: - (tuple ) diff --git a/deploy/charts/discovery-agent/templates/deployment.yaml b/deploy/charts/discovery-agent/templates/deployment.yaml index c2fd4e9a..35be4f3e 100644 --- a/deploy/charts/discovery-agent/templates/deployment.yaml +++ b/deploy/charts/discovery-agent/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} - image: "{{ template "image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" + image: "{{ template "discovery-agent.image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: POD_NAMESPACE diff --git a/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl b/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl index 5d781866..18fb8375 100644 --- a/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl +++ b/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl @@ -65,7 +65,7 @@ Create the name of the service account to use Util function for generating an image reference based on the provided options. This function is derviced from similar functions used in the cert-manager GitHub organization */}} -{{- define "image" -}} +{{- define "venafi-kubernetes-agent.image" -}} {{- /* Calling convention: - (tuple ) diff --git a/deploy/charts/venafi-kubernetes-agent/templates/deployment.yaml b/deploy/charts/venafi-kubernetes-agent/templates/deployment.yaml index 9f5c1ba3..24eb99a9 100644 --- a/deploy/charts/venafi-kubernetes-agent/templates/deployment.yaml +++ b/deploy/charts/venafi-kubernetes-agent/templates/deployment.yaml @@ -30,7 +30,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ template "image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" + image: "{{ template "venafi-kubernetes-agent.image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: POD_NAMESPACE From ecf4e064bca3f9308113ad37e715d1c7989c4977 Mon Sep 17 00:00:00 2001 From: FelixPhipps <78652401+FelixPhipps@users.noreply.github.com> Date: Tue, 28 Apr 2026 14:59:41 +0100 Subject: [PATCH 2/4] Update deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl Co-authored-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl b/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl index 18fb8375..c067a65c 100644 --- a/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl +++ b/deploy/charts/venafi-kubernetes-agent/templates/_helpers.tpl @@ -74,7 +74,7 @@ from `.Values` inside this helper, because `helm-tool lint` does not reliably tr usage through tuple/variable indirection. */ -}} {{- if ne (len .) 4 -}} - {{- fail (printf "ERROR: template \"image\" expects (tuple ), got %d arguments" (len .)) -}} + {{- fail (printf "ERROR: template \"venafi-kubernetes-agent.image\" expects (tuple ), got %d arguments" (len .)) -}} {{- end -}} {{- $image := index . 0 -}} {{- $imageRegistry := index . 1 | default "" -}} From 5c7e0a4d8b79cdb6664c79f0eb5de96ff828a88e Mon Sep 17 00:00:00 2001 From: FelixPhipps <78652401+FelixPhipps@users.noreply.github.com> Date: Tue, 28 Apr 2026 14:59:52 +0100 Subject: [PATCH 3/4] Update deploy/charts/disco-agent/templates/_helpers.tpl Co-authored-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- deploy/charts/disco-agent/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/disco-agent/templates/_helpers.tpl b/deploy/charts/disco-agent/templates/_helpers.tpl index 7dfb97b9..4cd42b1e 100644 --- a/deploy/charts/disco-agent/templates/_helpers.tpl +++ b/deploy/charts/disco-agent/templates/_helpers.tpl @@ -74,7 +74,7 @@ from `.Values` inside this helper, because `helm-tool lint` does not reliably tr usage through tuple/variable indirection. */ -}} {{- if ne (len .) 4 -}} - {{- fail (printf "ERROR: template \"image\" expects (tuple ), got %d arguments" (len .)) -}} + {{- fail (printf "ERROR: template \"disco-agent.image\" expects (tuple ), got %d arguments" (len .)) -}} {{- end -}} {{- $image := index . 0 -}} {{- $imageRegistry := index . 1 | default "" -}} From d4c3be63255452e794ca307e63bcca2cb639c67c Mon Sep 17 00:00:00 2001 From: FelixPhipps <78652401+FelixPhipps@users.noreply.github.com> Date: Tue, 28 Apr 2026 14:59:58 +0100 Subject: [PATCH 4/4] Update deploy/charts/discovery-agent/templates/_helpers.tpl Co-authored-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- deploy/charts/discovery-agent/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/discovery-agent/templates/_helpers.tpl b/deploy/charts/discovery-agent/templates/_helpers.tpl index f804b258..addebf23 100644 --- a/deploy/charts/discovery-agent/templates/_helpers.tpl +++ b/deploy/charts/discovery-agent/templates/_helpers.tpl @@ -74,7 +74,7 @@ from `.Values` inside this helper, because `helm-tool lint` does not reliably tr usage through tuple/variable indirection. */ -}} {{- if ne (len .) 4 -}} - {{- fail (printf "ERROR: template \"image\" expects (tuple ), got %d arguments" (len .)) -}} + {{- fail (printf "ERROR: template \"discovery-agent.image\" expects (tuple ), got %d arguments" (len .)) -}} {{- end -}} {{- $image := index . 0 -}} {{- $imageRegistry := index . 1 | default "" -}}