Merge remote-tracking branch 'upstream/master' into feature-argo-workflow-sa-setup

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

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

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:
@@ -58,6 +62,7 @@ data:
         useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }}
         {{- end }}
       {{- end }}
+    {{- end}}
     {{- if .Values.controller.metricsConfig.enabled }}
     metricsConfig:
 {{ toYaml .Values.controller.metricsConfig | indent 6}}{{- end }}

charts/argo/values.yaml

@@ -260,6 +260,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: