From 4ba9e5228ab0887755a8df487006a9a6d8d37ee7 Mon Sep 17 00:00:00 2001
From: Jon <jond3k@gmail.com>
Date: Fri, 4 Sep 2020 23:23:16 +0100
Subject: [PATCH 1/2] feat: Support GCS artifactRepository (#428)

---
 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 2a845430..7ec638e1 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.10.1
+version: 0.10.2
 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 54ba076e..9563ac12 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -33,6 +33,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:
@@ -57,6 +61,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 731b68ca..fc96e7f1 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -251,6 +251,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:

From cc52713dbd760209e279768784c9fb04ea1abe65 Mon Sep 17 00:00:00 2001
From: Vaibhav <vaibhav.page@gmail.com>
Date: Fri, 4 Sep 2020 19:15:12 -0400
Subject: [PATCH 2/2] chore: bump to latest (#440)

* chore: bump to latest

* chore: bump to latest

* update image versions
---
 charts/argo-events/Chart.yaml  | 4 ++--
 charts/argo-events/values.yaml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 9da7eea6..4f5960c4 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 0.17.1
+version: 1.0.0
 keywords:
   - argo-events
   - sensor-controller
@@ -12,6 +12,6 @@ sources:
 maintainers:
   - name: VaibhavPage
   - name: whynowy
-appVersion: 0.17.0
+appVersion: 1.0.0
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index d963d9db..1da1335f 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -46,21 +46,21 @@ singleNamespace: true
 sensorController:
   name: sensor-controller
   image: sensor-controller
-  tag: v0.17.0
+  tag: v1.0.0
   replicaCount: 1
   sensorImage: sensor
 
 eventsourceController:
   name: eventsource-controller
   image: eventsource-controller
-  tag: v0.17.0
+  tag: v1.0.0
   replicaCount: 1
   eventsourceImage: eventsource
 
 eventbusController:
   name: eventbus-controller
   image: eventbus-controller
-  tag: v0.17.0
+  tag: v1.0.0
   replicaCount: 1
   natsStreamingImage: nats-streaming:0.17.0
   natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2