From d56dda6e25d44556d600686ccdc67ec6d92a96e1 Mon Sep 17 00:00:00 2001
From: Mathieu Gaubert <mathieu.gaubert@metanext.com>
Date: Mon, 13 Jan 2020 14:12:13 +0100
Subject: [PATCH] Adding support for Workload Identity in backups

Allows GCP Workload Identity support in default backup storage location
as specified here https://github.com/vmware-tanzu/velero-plugin-for-gcp/blob/master/backupstoragelocation.md

Signed-off-by: Mathieu Gaubert <mathieu.gaubert@metanext.com>
---
 charts/velero/Chart.yaml                           | 2 +-
 charts/velero/templates/backupstoragelocation.yaml | 5 +++++
 charts/velero/values.yaml                          | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml
index c28a02d1..d5644672 100644
--- a/charts/velero/Chart.yaml
+++ b/charts/velero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.2.0
 description: A Helm chart for velero
 name: velero
-version: 2.8.1
+version: 2.8.2
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:
diff --git a/charts/velero/templates/backupstoragelocation.yaml b/charts/velero/templates/backupstoragelocation.yaml
index 78cac233..94dff6ab 100644
--- a/charts/velero/templates/backupstoragelocation.yaml
+++ b/charts/velero/templates/backupstoragelocation.yaml
@@ -44,6 +44,11 @@ spec:
     publicUrl: {{ . }}
   {{- end }}
   {{- end }}
+  {{- if .serviceAccount }}
+  {{- with .serviceAccount }}
+    serviceAccount: {{ . }}
+  {{- end }}
+  {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
index 9410be15..9534f36b 100644
--- a/charts/velero/values.yaml
+++ b/charts/velero/values.yaml
@@ -90,6 +90,9 @@ configuration:
     #  subscriptionId:
     #  storageAccount:
     #  publicUrl:
+    #  Name of the GCP service account to use for this backup storage location. Specify the
+    #  service account here if you want to use workload identity instead of providing the key file.(GCP only)
+    #  serviceAccount:
 
   # Parameters for the `default` VolumeSnapshotLocation. See
   # https://velero.io/docs/v1.0.0/api-types/volumesnapshotlocation/