Clean the old label, use only latest recommendations

Follow the ideas and changes of https://github.com/argoproj/argo-cd/pull/1035
This commit is contained in:
Liviu Costea 2019-02-01 18:52:14 +02:00
parent 302dd2254c
commit b43ba86f94
13 changed files with 8 additions and 24 deletions

View file

@ -3,7 +3,6 @@ kind: Deployment
metadata:
name: {{ include "argo-cd.fullname" . }}-application-controller
labels:
app: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -13,12 +12,10 @@ metadata:
spec:
selector:
matchLabels:
app: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
template:
metadata:
labels:
app: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View file

@ -14,5 +14,4 @@ spec:
- port: {{ .Values.applicationController.servicePort }}
targetPort: {{ .Values.applicationController.containerPort }}
selector:
app: {{ include "argo-cd.name" . }}-application-controller
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller

View file

@ -3,13 +3,11 @@ kind: ConfigMap
metadata:
name: {{ include "argo-cd.fullname" . }}-cm
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
app.kubernetes.io/component: server
data:
{{- if .Values.config.helmRepositories }}
helm.repositories: |

View file

@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
labels:
app: {{ include "argo-cd.name" . }}-metrics
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View file

@ -2,6 +2,12 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "argo-cd.fullname" . }}-rbac-cm
labels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
data:
{{- if .Values.rbac.policy-default }}
policy.default: {{ .Values.rbac.policy-default }}

View file

@ -3,7 +3,6 @@ kind: Deployment
metadata:
name: {{ include "argo-cd.fullname" . }}-repo-server
labels:
app: {{ include "argo-cd.name" . }}-repo-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -13,12 +12,10 @@ metadata:
spec:
selector:
matchLabels:
app: {{ include "argo-cd.name" . }}-repo-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
template:
metadata:
labels:
app: {{ include "argo-cd.name" . }}-repo-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View file

@ -3,7 +3,6 @@ kind: Service
metadata:
name: {{ include "argo-cd.fullname" . }}-repo-server
labels:
app: {{ include "argo-cd.name" . }}-repo-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -15,5 +14,4 @@ spec:
- port: {{ .Values.repoServer.servicePort }}
targetPort: {{ .Values.repoServer.servicePort }}
selector:
app: {{ include "argo-cd.name" . }}-repo-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server

View file

@ -3,13 +3,11 @@ kind: Secret
metadata:
name: {{ include "argo-cd.fullname" . }}-secret
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
app.kubernetes.io/component: server
type: Opaque
data:
{{- if .Values.config.webhook.githubSecret }}

View file

@ -3,7 +3,6 @@ kind: Deployment
metadata:
name: {{ include "argo-cd.fullname" . }}-server
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -13,12 +12,10 @@ metadata:
spec:
selector:
matchLabels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
template:
metadata:
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View file

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

View file

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

View file

@ -3,7 +3,6 @@ kind: ServiceAccount
metadata:
name: {{ include "argo-cd.fullname" . }}-server
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View file

@ -3,7 +3,6 @@ kind: Service
metadata:
name: {{ include "argo-cd.fullname" . }}-server
labels:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
helm.sh/chart: {{ include "argo-cd.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
@ -21,6 +20,5 @@ spec:
port: {{ .Values.repoServer.servicePortHttps }}
targetPort: {{ .Values.repoServer.containerPort }}
selector:
app: {{ include "argo-cd.name" . }}-server
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server