From 353f9447423f2ecd7608c1775fb1bc5ad439049c Mon Sep 17 00:00:00 2001
From: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
Date: Tue, 9 Apr 2019 15:53:49 -0700
Subject: [PATCH] Add workaround for
 https://github.com/argoproj/argo-cd/issues/1425

---
 charts/argo-cd/templates/crds/application-crd.yaml | 5 +++--
 charts/argo-cd/templates/crds/appproject-crd.yaml  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/templates/crds/application-crd.yaml b/charts/argo-cd/templates/crds/application-crd.yaml
index 377c570f..5c2b8b60 100644
--- a/charts/argo-cd/templates/crds/application-crd.yaml
+++ b/charts/argo-cd/templates/crds/application-crd.yaml
@@ -4,7 +4,8 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+#   Don't apply label due to https://github.com/argoproj/argo-cd/issues/1425
+#   app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
   name: applications.argoproj.io
@@ -19,4 +20,4 @@ spec:
     - app
     - apps
   scope: Namespaced
-  version: v1alpha1
\ No newline at end of file
+  version: v1alpha1
diff --git a/charts/argo-cd/templates/crds/appproject-crd.yaml b/charts/argo-cd/templates/crds/appproject-crd.yaml
index 1b2ab3fd..afd1a38e 100644
--- a/charts/argo-cd/templates/crds/appproject-crd.yaml
+++ b/charts/argo-cd/templates/crds/appproject-crd.yaml
@@ -4,7 +4,8 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+#   Don't apply label due to https://github.com/argoproj/argo-cd/issues/1425
+#   app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
   name: appprojects.argoproj.io
@@ -19,4 +20,4 @@ spec:
     - appproj
     - appprojs
   scope: Namespaced
-  version: v1alpha1
\ No newline at end of file
+  version: v1alpha1