From 8b26bed62f240c68d555508f1ab43131d76c3a68 Mon Sep 17 00:00:00 2001
From: bgeens2 <bg@ipng.be>
Date: Sat, 12 Mar 2022 18:55:33 +0100
Subject: [PATCH] feat(argo-workflows): Add encryptionOptions to S3 based
 artifactRepository (#1122)

* add encryptionOptions

* fix indentation

* fix typo

* fix mapping

* update version

* document usage in comments in values.yaml

* document usage in comments in values.yaml

Signed-off-by: Bart Geens <bgeens2@its.jnj.com>

* Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Bart Geens <bgeens2@its.jnj.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-workflows/Chart.yaml                              | 4 ++--
 .../templates/controller/workflow-controller-config-map.yaml  | 4 ++++
 charts/argo-workflows/values.yaml                             | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index 45427111..052f9093 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.12.0
+version: 0.13.0
 appVersion: v3.2.9
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
@@ -15,4 +15,4 @@ maintainers:
   - name: benjaminws
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Add parameter for enabling roles."
+    - "[Added]: Add encryptionOptions for S3 based artifactRepository"
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
index c09a0dc9..f602d89e 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
@@ -76,6 +76,10 @@ data:
         {{- if .Values.artifactRepository.s3.useSDKCreds }}
         useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }}
         {{- end }}
+        {{- with .Values.artifactRepository.s3.encryptionOptions }}
+        encryptionOptions:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       {{- end }}
     {{- end}}
     {{- if .Values.controller.metricsConfig.enabled }}
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index 1a33644c..765d5924 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -491,6 +491,8 @@ artifactRepository:
     # region:
     # roleARN:
     # useSDKCreds: true
+    # encryptionOptions:
+    #    enableEncryption: true
   # -- Store artifact in a GCS object store
   # @default -- `{}` (See [values.yaml])
   gcs: {}