ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

Add workaround for https://github.com/argoproj/argo-cd/issues/1425

main
Alexander Matyushentsev 2019-04-09 15:53:49 -07:00
parent f6f4615b15
commit 353f944742
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
charts/argo-cd/templates/crds/application-crd.yaml
View File

@ -4,7 +4,8 @@ metadata:
labels: labels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}
helm.sh/chart: {{ include "argo-cd.chart" . }} 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/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
name: applications.argoproj.io name: applications.argoproj.io
@ -19,4 +20,4 @@ spec:
- app - app
- apps - apps
scope: Namespaced scope: Namespaced
version: v1alpha1 version: v1alpha1

5
charts/argo-cd/templates/crds/appproject-crd.yaml
View File

@ -4,7 +4,8 @@ metadata:
labels: labels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}
helm.sh/chart: {{ include "argo-cd.chart" . }} 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/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
name: appprojects.argoproj.io name: appprojects.argoproj.io
@ -19,4 +20,4 @@ spec:
- appproj - appproj
- appprojs - appprojs
scope: Namespaced scope: Namespaced
version: v1alpha1 version: v1alpha1