From aa29b856ef9a296d6e6cc1754e15d5401f30dc7d Mon Sep 17 00:00:00 2001
From: Naseem <naseem@transit.app>
Date: Sat, 15 Feb 2020 09:41:27 -0500
Subject: [PATCH] [stable/Influxdb] make mounting of GSA key optional for
 backups to GCS (#20780)

* influxdb-fix-labels

Signed-off-by: Naseem <naseem@transit.app>

* Fix labels

Signed-off-by: Naseem <naseem@transit.app>

* Allow use of workload identity to auth to GCS

By making the mounting of a GSA key optional, it give the option of using workload identity to provide the backup with access to GCS. For more info on workload identity please see https://cloud.google.com/kubernetes-engine/docs/how-to/workload-identity

Signed-off-by: Naseem <naseem@transit.app>
---
 stable/influxdb/Chart.yaml                    |  4 +++-
 stable/influxdb/OWNERS                        |  2 ++
 stable/influxdb/templates/backup-cronjob.yaml | 14 +++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/stable/influxdb/Chart.yaml b/stable/influxdb/Chart.yaml
index ccfe7f44a0..c61e3a9ea3 100755
--- a/stable/influxdb/Chart.yaml
+++ b/stable/influxdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: influxdb
-version: 4.0.1
+version: 4.1.0
 appVersion: 1.7.6
 description: Scalable datastore for metrics, events, and real-time analytics.
 keywords:
@@ -15,4 +15,6 @@ maintainers:
   email: jack@influxdb.com
 - name: aisuko
   email: urakiny@gmail.com
+- name: naseemkullah
+  email: naseem@transit.app
 engine: gotpl
diff --git a/stable/influxdb/OWNERS b/stable/influxdb/OWNERS
index 4e5989f509..cb26731a33 100644
--- a/stable/influxdb/OWNERS
+++ b/stable/influxdb/OWNERS
@@ -1,6 +1,8 @@
 approvers:
 - jackzampolin
 - aisuko
+- naseemkullah
 reviewers:
 - jackzampolin
 - aisuko
+- naseemkullah
diff --git a/stable/influxdb/templates/backup-cronjob.yaml b/stable/influxdb/templates/backup-cronjob.yaml
index 10f49e1f6c..9d7aee9dc6 100644
--- a/stable/influxdb/templates/backup-cronjob.yaml
+++ b/stable/influxdb/templates/backup-cronjob.yaml
@@ -22,11 +22,13 @@ spec:
           volumes:
           - name: backups
             emptyDir: {}
-          {{- if and .Values.backup.gcs }}
+          {{- if .Values.backup.gcs }}
+          {{- if .Values.backup.gcs.serviceAccountSecret }}
           - name: google-cloud-key
             secret:
               secretName: {{ .Values.backup.gcs.serviceAccountSecret | quote }}
           {{- end }}
+          {{- end }}
           serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
           initContainers:
           - name: influxdb-backup
@@ -41,7 +43,7 @@ spec:
             - |
               influxd backup -host {{ template "influxdb.fullname" . }}.{{ .Release.Namespace }}.svc:{{ .Values.config.rpc.bind_address }} -portable /backups/backup_$(date +%Y%m%d_%H%M%S)
           containers:
-          {{- if .Values.backup.gcs}}
+          {{- if .Values.backup.gcs }}
           - name: gsutil-cp
             image: google/cloud-sdk:alpine
             command:
@@ -49,20 +51,26 @@ spec:
             args:
             - '-c'
             - |
-              gcloud auth activate-service-account --key-file $KEY_FILE
+              if [ -n "$KEY_FILE" ]; then
+                gcloud auth activate-service-account --key-file $KEY_FILE
+              fi
               gsutil -m cp -r "$SRC_URL" "$DST_URL"
             volumeMounts:
             - name: backups
               mountPath: /backups
+            {{- if .Values.backup.gcs.serviceAccountSecretKey}}
             - name: google-cloud-key
               mountPath: /var/secrets/google/
+            {{- end }}
             env:
               - name: SRC_URL
                 value: /backups
               - name: DST_URL
                 value: {{ .Values.backup.gcs.destination}}
+              {{- if .Values.backup.gcs.serviceAccountSecretKey}}
               - name: KEY_FILE
                 value: /var/secrets/google/{{ .Values.backup.gcs.serviceAccountSecretKey }}
+              {{- end }}
           {{- end }}
           {{- if .Values.backup.azure }}
           - name: azure-cli