From ece06ce7535925760b901d630320b429524e6dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 5 Jul 2019 18:22:36 +0200 Subject: [PATCH] [stable/kube-state-metrics] Apply best practices for label naming (#15261) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Rüger --- stable/kube-state-metrics/Chart.yaml | 2 +- .../kube-state-metrics/templates/clusterrole.yaml | 8 ++++---- .../templates/clusterrolebinding.yaml | 8 ++++---- .../kube-state-metrics/templates/deployment.yaml | 14 +++++++------- .../templates/podsecuritypolicy.yaml | 8 ++++---- .../templates/psp-clusterrole.yaml | 8 ++++---- .../templates/psp-clusterrolebinding.yaml | 8 ++++---- stable/kube-state-metrics/templates/service.yaml | 12 ++++++------ .../templates/serviceaccount.yaml | 8 ++++---- .../templates/servicemonitor.yaml | 12 ++++++------ 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml index 67574ea394..b2f7573bfa 100644 --- a/stable/kube-state-metrics/Chart.yaml +++ b/stable/kube-state-metrics/Chart.yaml @@ -6,7 +6,7 @@ keywords: - monitoring - prometheus - kubernetes -version: 1.6.5 +version: 2.0.0 appVersion: 1.6.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/stable/kube-state-metrics/templates/clusterrole.yaml b/stable/kube-state-metrics/templates/clusterrole.yaml index 2c59adf5f6..9ded59935c 100644 --- a/stable/kube-state-metrics/templates/clusterrole.yaml +++ b/stable/kube-state-metrics/templates/clusterrole.yaml @@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} name: {{ template "kube-state-metrics.fullname" . }} rules: {{ if .Values.collectors.certificatesigningrequests }} diff --git a/stable/kube-state-metrics/templates/clusterrolebinding.yaml b/stable/kube-state-metrics/templates/clusterrolebinding.yaml index e57b051f1f..b4586fb7e8 100644 --- a/stable/kube-state-metrics/templates/clusterrolebinding.yaml +++ b/stable/kube-state-metrics/templates/clusterrolebinding.yaml @@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} name: {{ template "kube-state-metrics.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml index 62f0b73059..4ea1af0435 100644 --- a/stable/kube-state-metrics/templates/deployment.yaml +++ b/stable/kube-state-metrics/templates/deployment.yaml @@ -3,20 +3,20 @@ kind: Deployment metadata: name: {{ template "kube-state-metrics.fullname" . }} labels: - app: {{ template "kube-state-metrics.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app.kubernetes.io/instance: "{{ .Release.Name }}" + app.kubernetes.io/managed-by: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "kube-state-metrics.name" . }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} replicas: {{ .Values.replicas }} template: metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - release: "{{ .Release.Name }}" + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + app.kubernetes.io/instance: "{{ .Release.Name }}" {{- if .Values.podAnnotations }} annotations: {{ toYaml .Values.podAnnotations | indent 8 }} diff --git a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml index b44ca36f6f..aeff11791c 100644 --- a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml +++ b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml @@ -4,10 +4,10 @@ kind: PodSecurityPolicy metadata: name: {{ template "kube-state-metrics.fullname" . }} labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.podSecurityPolicy.annotations }} annotations: {{ toYaml .Values.podSecurityPolicy.annotations | indent 4 }} diff --git a/stable/kube-state-metrics/templates/psp-clusterrole.yaml b/stable/kube-state-metrics/templates/psp-clusterrole.yaml index c43f90da2c..dcd65e13e4 100644 --- a/stable/kube-state-metrics/templates/psp-clusterrole.yaml +++ b/stable/kube-state-metrics/templates/psp-clusterrole.yaml @@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} name: psp-{{ template "kube-state-metrics.fullname" . }} rules: - apiGroups: ['extensions'] diff --git a/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml index bfca12cab4..741861826a 100644 --- a/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml +++ b/stable/kube-state-metrics/templates/psp-clusterrolebinding.yaml @@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} name: psp-{{ template "kube-state-metrics.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/stable/kube-state-metrics/templates/service.yaml b/stable/kube-state-metrics/templates/service.yaml index b6daacdf46..01f41e99f4 100644 --- a/stable/kube-state-metrics/templates/service.yaml +++ b/stable/kube-state-metrics/templates/service.yaml @@ -3,10 +3,10 @@ kind: Service metadata: name: {{ template "kube-state-metrics.fullname" . }} labels: - app: {{ template "kube-state-metrics.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app.kubernetes.io/instance: "{{ .Release.Name }}" + app.kubernetes.io/managed-by: "{{ .Release.Service }}" {{- if .Values.prometheusScrape }} annotations: prometheus.io/scrape: '{{ .Values.prometheusScrape }}' @@ -25,5 +25,5 @@ spec: loadBalancerIP: "{{ .Values.service.loadBalancerIP }}" {{- end }} selector: - app: {{ template "kube-state-metrics.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/stable/kube-state-metrics/templates/serviceaccount.yaml b/stable/kube-state-metrics/templates/serviceaccount.yaml index 5459abb10a..e2bf7c0126 100644 --- a/stable/kube-state-metrics/templates/serviceaccount.yaml +++ b/stable/kube-state-metrics/templates/serviceaccount.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app: {{ template "kube-state-metrics.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} name: {{ template "kube-state-metrics.fullname" . }} imagePullSecrets: {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }} diff --git a/stable/kube-state-metrics/templates/servicemonitor.yaml b/stable/kube-state-metrics/templates/servicemonitor.yaml index af151f1024..7532ef89cd 100644 --- a/stable/kube-state-metrics/templates/servicemonitor.yaml +++ b/stable/kube-state-metrics/templates/servicemonitor.yaml @@ -4,18 +4,18 @@ kind: ServiceMonitor metadata: name: {{ template "kube-state-metrics.fullname" . }} labels: - app: {{ template "kube-state-metrics.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app.kubernetes.io/instance: "{{ .Release.Name }}" + app.kubernetes.io/managed-by: "{{ .Release.Service }}" {{- if .Values.prometheus.monitor.additionalLabels }} {{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }} {{- end }} spec: selector: matchLabels: - app: {{ template "kube-state-metrics.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} endpoints: - port: http {{- end }}