From 78ba31615b2fabc4d2bb73f9180ba79e432010fa Mon Sep 17 00:00:00 2001
From: 1602077 <62025739+1602077@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:43:30 +0200
Subject: [PATCH 1/3] fix: add template for generating node-agent name

Signed-off-by: 1602077 <62025739+1602077@users.noreply.github.com>
---
 charts/velero/templates/_helpers.tpl              | 7 +++++++
 charts/velero/templates/node-agent-daemonset.yaml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/velero/templates/_helpers.tpl b/charts/velero/templates/_helpers.tpl
index 00d97db4..a07f3fdb 100644
--- a/charts/velero/templates/_helpers.tpl
+++ b/charts/velero/templates/_helpers.tpl
@@ -64,6 +64,13 @@ Create the Velero priority class name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create the name of the node agent.
+*/}}
+{{- define "velero.nodeAgent" -}}
+  {{ default (printf "%s-%s" (include "velero.fullname" .) "node-agent") .Values.serviceAccount.server.name }}
+{{- end -}}
+
 {{/*
 Create the node-Agent priority class name.
 */}}
diff --git a/charts/velero/templates/node-agent-daemonset.yaml b/charts/velero/templates/node-agent-daemonset.yaml
index 68fedf3f..6d9b23cc 100644
--- a/charts/velero/templates/node-agent-daemonset.yaml
+++ b/charts/velero/templates/node-agent-daemonset.yaml
@@ -4,7 +4,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: node-agent
+  name: {{ include "velero.nodeAgent" . }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.nodeAgent.annotations }}
   annotations:

From 68fcfe80ee62c02dad08be8f7c5666ae5de1685c Mon Sep 17 00:00:00 2001
From: 1602077 <62025739+1602077@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:45:34 +0200
Subject: [PATCH 2/3] bump: chart version

Signed-off-by: 1602077 <62025739+1602077@users.noreply.github.com>
---
 charts/velero/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml
index 60af2be8..0da4aa2c 100644
--- a/charts/velero/Chart.yaml
+++ b/charts/velero/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: 1.14.0
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart for velero
 name: velero
-version: 7.1.0
+version: 7.2.0
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:
-- https://github.com/vmware-tanzu/velero
+  - https://github.com/vmware-tanzu/velero
 maintainers:
   - name: jenting
     email: hsiaoairplane@gmail.com

From d143fe8cc03fe0ce4c1ef9bc7e0996dd64cb6744 Mon Sep 17 00:00:00 2001
From: 1602077 <62025739+1602077@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:28:09 +0200
Subject: [PATCH 3/3] fix: remove sa default from node-agent template

Signed-off-by: 1602077 <62025739+1602077@users.noreply.github.com>
---
 charts/velero/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/velero/templates/_helpers.tpl b/charts/velero/templates/_helpers.tpl
index a07f3fdb..900ff00e 100644
--- a/charts/velero/templates/_helpers.tpl
+++ b/charts/velero/templates/_helpers.tpl
@@ -68,7 +68,7 @@ Create the Velero priority class name.
 Create the name of the node agent.
 */}}
 {{- define "velero.nodeAgent" -}}
-  {{ default (printf "%s-%s" (include "velero.fullname" .) "node-agent") .Values.serviceAccount.server.name }}
+  {{ printf "%s-%s" (include "velero.fullname" .) "node-agent" }}
 {{- end -}}
 
 {{/*