DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove release: {{ .Release.Name }} label

Browse source 
release: {{ .Release.Name }} label removed and selectors updated to use existing app.kubernetes.io/instance:  {{ .Release.Name }}
This commit is contained in:
Jaret Deprin 2019-10-15 12:10:34 -07:00
parent 79a683f8c6
commit 89716e2ebc
27 changed files with 13 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
View file

@ -4,7 +4,6 @@ kind: ClusterRole
metadata:
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml
View file

@ -4,7 +4,6 @@ kind: ClusterRoleBinding
metadata:
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

4
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -4,7 +4,6 @@ kind: Deployment
metadata:
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -15,7 +14,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
revisionHistoryLimit: 5
replicas: 1
template:
@ -27,7 +26,6 @@ spec:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

3
charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml
View file

@ -9,7 +9,6 @@ metadata:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -27,6 +26,6 @@ spec:
port: {{ .Values.controller.metrics.service.servicePort }}
targetPort: controller
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
{{- end }}

1
charts/argo-cd/templates/argocd-application-controller/role.yaml
View file

@ -4,7 +4,6 @@ kind: Role
metadata:
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml
View file

@ -4,7 +4,6 @@ kind: RoleBinding
metadata:
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

3
charts/argo-cd/templates/argocd-application-controller/service.yaml
View file

@ -10,7 +10,6 @@ metadata:
{{- end }}
name: {{ template "argo-cd.controller.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -23,6 +22,6 @@ spec:
port: {{ .Values.controller.service.port }}
targetPort: {{ .Values.controller.containerPort }}
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
{{- end }}

1
charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml
View file

@ -4,7 +4,6 @@ kind: ServiceAccount
metadata:
name: {{ template "argo-cd.controllerServiceAccountName" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
View file

@ -27,7 +27,6 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
app.kubernetes.io/component: {{ .Values.controller.name }}
{{- end }}

1
charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
View file

@ -4,7 +4,6 @@ kind: ConfigMap
metadata:
name: argocd-cm
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-cm
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml
View file

@ -4,7 +4,6 @@ kind: ConfigMap
metadata:
name: argocd-rbac-cm
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
View file

@ -4,7 +4,6 @@ kind: Secret
metadata:
name: argocd-secret
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-secret
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml
View file

@ -4,7 +4,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-ssh-known-hosts-cm
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml
View file

@ -4,7 +4,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-tls-certs-cm
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

4
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -4,7 +4,6 @@ kind: Deployment
metadata:
name: {{ template "argo-cd.repoServer.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -15,7 +14,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
revisionHistoryLimit: 5
replicas: 1
template:
@ -27,7 +26,6 @@ spec:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

3
charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml
View file

@ -9,7 +9,6 @@ metadata:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -27,6 +26,6 @@ spec:
port: {{ .Values.repoServer.metrics.service.servicePort }}
targetPort: metrics
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
{{- end }}

2
charts/argo-cd/templates/argocd-repo-server/service.yaml
View file

@ -23,6 +23,6 @@ spec:
port: {{ .Values.repoServer.service.port }}
targetPort: repo-server
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }}
{{- end }}

2
charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
View file

@ -27,7 +27,7 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
app.kubernetes.io/component: {{ .Values.repoServer.name }}
{{- end }}

4
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -4,7 +4,6 @@ kind: Deployment
metadata:
name: {{ template "argo-cd.server.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -15,7 +14,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
revisionHistoryLimit: 5
replicas: 1
template:
@ -27,7 +26,6 @@ spec:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

3
charts/argo-cd/templates/argocd-server/metrics-service.yaml
View file

@ -9,7 +9,6 @@ metadata:
{{- end }}
{{- end }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -27,6 +26,6 @@ spec:
port: {{ .Values.server.metrics.service.servicePort }}
targetPort: metrics
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
{{- end }}

2
charts/argo-cd/templates/argocd-server/service.yaml
View file

@ -28,6 +28,6 @@ spec:
port: {{ .Values.server.service.servicePortHttps }}
targetPort: {{ .Values.server.name }}
selector:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
{{- end }}

2
charts/argo-cd/templates/argocd-server/servicemonitor.yaml
View file

@ -27,7 +27,7 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
app.kubernetes.io/component: {{ .Values.server.name }}
{{- end }}

4
charts/argo-cd/templates/dex/deployment.yaml
View file

@ -4,7 +4,6 @@ kind: Deployment
metadata:
name: {{ template "argo-cd.dex.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -15,11 +14,10 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/dex/role.yaml
View file

@ -4,7 +4,6 @@ kind: Role
metadata:
name: {{ template "argo-cd.dex.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

1
charts/argo-cd/templates/dex/rolebinding.yaml
View file

@ -4,7 +4,6 @@ kind: RoleBinding
metadata:
name: {{ template "argo-cd.dex.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

3
charts/argo-cd/templates/dex/service.yaml
View file

@ -4,7 +4,6 @@ kind: Service
metadata:
name: {{ template "argo-cd.dex.fullname" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -23,5 +22,5 @@ spec:
targetPort: grpc
selector:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
release: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

1
charts/argo-cd/templates/dex/serviceaccount.yaml
View file

@ -4,7 +4,6 @@ kind: ServiceAccount
metadata:
name: {{ template "argo-cd.dexServiceAccountName" . }}
labels:
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}