From 4617535b72b5bd5f9ec0b4201e4fbb721eb07895 Mon Sep 17 00:00:00 2001
From: e-mon <emon18@icloud.com>
Date: Wed, 17 Apr 2019 03:18:13 +0900
Subject: [PATCH 1/2] Adding Service Annotation to argo-cd helm chart (#53)

---
 charts/argo-cd/templates/argocd-server-service.yaml | 2 ++
 charts/argo-cd/values.yaml                          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/charts/argo-cd/templates/argocd-server-service.yaml b/charts/argo-cd/templates/argocd-server-service.yaml
index 371c4b2f..2f8decca 100755
--- a/charts/argo-cd/templates/argocd-server-service.yaml
+++ b/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
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9061043d..f3b40b19 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -12,6 +12,7 @@ server:
   servicePortHttps: 443
   containerMetricsPort: 8082
   serviceMetricsPort: 8082
+  serviceAnnotations: {}
   image:
     repository: argoproj/argocd
     tag: v0.12.1

From eaa34e6cdd1ea223bf8d655d96e7ac21ebf4e045 Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Tue, 16 Apr 2019 13:20:40 -0500
Subject: [PATCH 2/2] workflow-crd.yaml: delete before hook creation (#50)

---
 charts/argo/templates/workflow-crd.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/argo/templates/workflow-crd.yaml b/charts/argo/templates/workflow-crd.yaml
index f65e5d14..64a77d7f 100644
--- a/charts/argo/templates/workflow-crd.yaml
+++ b/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