Merge branch 'master' into add-resource-customizations

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 }}
@@ -32,3 +32,7 @@ data:
   resource.customizations: |
 {{ toYaml .Values.config.resourceCustomizations | indent 4 }}
 {{- end }}
+{{- if .Values.config.configManagementPlugins }}
+  configManagementPlugins: |
+{{ toYaml .Values.config.configManagementPlugins | indent 4 }}
+{{- end }}

charts/argo-cd/values.yaml

@@ -62,9 +62,9 @@ ingress:
   hosts:
     - argocd.example.com
 
-# Standard Argo CD installation with cluster-admin access. 
+# 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 
+# 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). 
+#     Argo CD runs in (i.e. kubernetes.svc.default).
 # Will still be able to deploy to external clusters with inputted credentials.
 
 clusterAdminAccess:
@@ -119,17 +119,26 @@ 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:
   # resourceCustomizations can be used to create custom health checks for resources
   # https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/health.md#way-1-define-a-custom-health-check-in-argocd-cm-configmap
-  # resourceCustomizations:
+  resourceCustomizations:
   #   certmanager.k8s.io/Certificate:
   #     health.lua: |
   #       hs = {}
   #       ...
   #       return hs
+  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.

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:

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.