Merge branch 'master' into fix-argocd-metrics-service

charts/argo-cd/templates/argocd-server-service.yaml

@@ -9,6 +9,8 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
     app.kubernetes.io/component: server
+  annotations:
+{{ toYaml .Values.server.serviceAnnotations | indent 4}}{{- end }}
 spec:
   ports:
   - name: http

charts/argo-cd/values.yaml

@@ -10,6 +10,7 @@ server:
   containerPort: 8080
   servicePortHttp: 80
   servicePortHttps: 443
+  serviceAnnotations: {}
   image:
     repository: argoproj/argocd
     tag: v0.12.1

charts/argo/templates/workflow-crd.yaml

@@ -4,6 +4,7 @@ metadata:
   name: workflows.argoproj.io
   annotations:
     helm.sh/hook: crd-install
+    helm.sh/hook-delete-policy: before-hook-creation
 spec:
   group: argoproj.io
   version: v1alpha1