Merge branch 'master' into cleanup/argocd_drop_crd_hooks

charts/argo-workflows/.helmignore

@@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+ci/

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.2.2
+version: 0.2.4
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm

charts/argo-workflows/templates/controller/workflow-controller-sa.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.controller.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -6,3 +7,4 @@ metadata:
   annotations:
     {{- toYaml .| nindent 4 }}
   {{- end }}
+{{- end }}

charts/argo-workflows/values.yaml

@@ -12,6 +12,14 @@ init:
 
 createAggregateRoles: true
 
+## String to partially override "argo-workflows.fullname" template
+##
+nameOverride:
+
+## String to fully override "argo-workflows.fullname" template
+##
+fullnameOverride:
+
 # Restrict Argo to only deploy into a single namespace by apply Roles and RoleBindings instead of the Cluster equivalents,
 # and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy.
 singleNamespace: false

charts/argocd-notifications/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.3.2
+version: 1.4.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/service-metrics.yaml

@@ -5,6 +5,13 @@ metadata:
   name: {{ include "argocd-notifications.name" . }}-metrics
   labels:
     {{- include "argocd-notifications.metrics.labels" . | nindent 4 }}
+    {{- with .Values.metrics.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.metrics.service.annotations  }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     {{- include "argocd-notifications.selectorLabels" . | nindent 4 }}

charts/argocd-notifications/values.yaml

@@ -52,6 +52,9 @@ extraArgs: []
 metrics:
   enabled: false
   port: 9001
+  service:
+    annotations: {}
+    labels: {}
   serviceMonitor:
     enabled: false
     additionalLabels: {}