From 5a32f833c595a896cb4bc5810177ab03a104aca1 Mon Sep 17 00:00:00 2001
From: jdavey <jond3k@gmail.com>
Date: Thu, 20 Aug 2020 00:53:45 +0100
Subject: [PATCH] feat: Support GCS artifactRepository

---
 charts/argo/Chart.yaml                            |  2 +-
 .../templates/workflow-controller-config-map.yaml |  5 +++++
 charts/argo/values.yaml                           | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index de0c3833..112e2ae0 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.8.0
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.9.8
+version: 0.9.9
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 5dde9ff3..13834e17 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -30,6 +30,10 @@ data:
       {{- if .Values.artifactRepository.archiveLogs }}
       archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
       {{- end }}
+      {{- if .Values.artifactRepository.gcs }}
+      gcs:
+{{ toYaml .Values.artifactRepository.gcs | indent 8}}
+      {{- else }}
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
@@ -54,6 +58,7 @@ data:
         {{- if .Values.artifactRepository.s3.useSDKCreds }}
         useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }}
         {{- end }}
+      {{- end }}
     {{- end}}
     {{- if .Values.controller.metricsConfig.enabled }}
     metricsConfig:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 0dc5dd47..6ffc5eef 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -240,6 +240,21 @@ artifactRepository:
     # region:
     # roleARN:
     # useSDKCreds: true
+  # gcs:
+    # bucket: <project>-argo
+    # keyFormat: "{{workflow.namespace}}/{{workflow.name}}/"
+    # serviceAccountKeySecret is a secret selector.
+    # It references the k8s secret named 'my-gcs-credentials'.
+    # This secret is expected to have have the key 'serviceAccountKey',
+    # containing the base64 encoded credentials
+    # to the bucket.
+    #
+    # If it's running on GKE and Workload Identity is used,
+    # serviceAccountKeySecret is not needed.
+    # serviceAccountKeySecret:
+      # name: my-gcs-credentials
+      # key: serviceAccountKey
+
 
 # NOTE: These are setting attributes for the `minio` optional dependency
 minio: