From 4a81cb07144fae12c1f819f7f9d0e949a9b846dd Mon Sep 17 00:00:00 2001
From: kornesh <kornesh.kanan@gmail.com>
Date: Tue, 7 May 2019 22:45:50 +0800
Subject: [PATCH 1/2] Add archiveLogs option to Argo workflow controller config
 map (#32)

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

diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index f77637a0..6d456905 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -17,6 +17,9 @@ data:
     {{- end }}
     artifactRepository:
       {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
+      {{- if .Values.artifactRepository.archiveLogs }}
+      archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
+      {{- end }}
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 09faee2f..85a4fc37 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -79,6 +79,8 @@ ui:
 useDefaultArtifactRepo: false
 useStaticCredentials: true
 artifactRepository:
+  # archiveLogs will archive the main container logs as an artifact
+  archiveLogs: false
   s3:
     # Note the `key` attribute is not the actual secret, it's the PATH to
     # the contents in the associated secret, as defined by the `name` attribute.

From 315ea0516efacbb0d203dcf816a80832d225d219 Mon Sep 17 00:00:00 2001
From: Kouta Ozaki <cw-ozaki@users.noreply.github.com>
Date: Tue, 7 May 2019 23:46:21 +0900
Subject: [PATCH 2/2] Add configManagementPlugins option to argo-cd (#63)

---
 charts/argo-cd/templates/argocd-cm.yaml |  6 +++++-
 charts/argo-cd/values.yaml              | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml
index ab7f1961..7dfea6e6 100755
--- a/charts/argo-cd/templates/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-cm.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: argocd-cm
-  labels: 
+  labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -28,3 +28,7 @@ data:
   oidc.config: |
 {{ toYaml .Values.config.oidcConfig | indent 4 }}
 {{- end }}
+{{- if .Values.config.configManagementPlugins }}
+  configManagementPlugins: |
+{{ toYaml .Values.config.configManagementPlugins | indent 4 }}
+{{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 479e0820..ab13e770 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -62,9 +62,9 @@ ingress:
   hosts:
     - argocd.example.com
 
-# Standard Argo CD installation with cluster-admin access. 
-# Set this true if you plan to use Argo CD to deploy applications in the same cluster that 
-#     Argo CD runs in (i.e. kubernetes.svc.default). 
+# Standard Argo CD installation with cluster-admin access.
+# Set this true if you plan to use Argo CD to deploy applications in the same cluster that
+#     Argo CD runs in (i.e. kubernetes.svc.default).
 # Will still be able to deploy to external clusters with inputted credentials.
 
 clusterAdminAccess:
@@ -119,9 +119,18 @@ config:
   # provider webhook secret. The payload URL configured in the git provider should use the
   # /api/webhook endpoint of your Argo CD instance (e.g. https://argocd.example.com/api/webhook)
   webhook:
-    githubSecret: 
+    githubSecret:
     gitlabSecret:
     bitbucketSecret:
+  configManagementPlugins:
+    # - name: pluginName
+    #   init:                          # Optional command to initialize application source directory
+    #     command: ["sample command"]
+    #     args: ["sample args"]
+    #   generate:                      # Command to generate manifests YAML
+    #     command: ["sample command"]
+    #     args: ["sample args"]
+
 rbac:
 #   # An RBAC policy .csv file containing additional policy and role definitions.
 #   # See https://github.com/argoproj/argo-cd/blob/master/docs/rbac.md on how to write RBAC policies.