From d235c35db38cc0d3f80f1abfad6fcaf5db699d2b Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 27 Aug 2022 17:56:18 +0200 Subject: [PATCH] Refactoring labels (#362) * Update: Refactoring labels Signed-off-by: Nicolas Lamirault * Fix: typo Signed-off-by: Nicolas Lamirault * newline Signed-off-by: Nicolas Lamirault Co-authored-by: Sean Glover --- .../templates/000-ServiceAccount.yaml | 5 +---- ...020-StrimziWatcher-ClusterRoleBinding.yaml | 5 +---- .../templates/030-ConfigMap.yaml | 5 +---- .../templates/031-MountedSecret.yaml | 5 +---- .../templates/040-Deployment.yaml | 11 +++------- .../templates/050-Service.yaml | 8 ++------ .../templates/060-ServiceMonitor.yaml | 9 ++------- .../templates/070-PrometheusRule.yaml | 5 +---- .../kafka-lag-exporter/templates/_helpers.tpl | 20 +++++++++++++++++++ charts/kafka-lag-exporter/values.yaml | 4 ++++ 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/charts/kafka-lag-exporter/templates/000-ServiceAccount.yaml b/charts/kafka-lag-exporter/templates/000-ServiceAccount.yaml index b53afdd3..a1387b97 100644 --- a/charts/kafka-lag-exporter/templates/000-ServiceAccount.yaml +++ b/charts/kafka-lag-exporter/templates/000-ServiceAccount.yaml @@ -8,10 +8,7 @@ metadata: name: {{ include "kafka-lag-exporter.fullname" . }}-serviceaccount {{- end }} labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} {{- if .Values.serviceAccount.annotations }} annotations: {{ toYaml .Values.serviceAccount.annotations }} diff --git a/charts/kafka-lag-exporter/templates/020-StrimziWatcher-ClusterRoleBinding.yaml b/charts/kafka-lag-exporter/templates/020-StrimziWatcher-ClusterRoleBinding.yaml index 85cbc6e8..f9345ae5 100644 --- a/charts/kafka-lag-exporter/templates/020-StrimziWatcher-ClusterRoleBinding.yaml +++ b/charts/kafka-lag-exporter/templates/020-StrimziWatcher-ClusterRoleBinding.yaml @@ -5,10 +5,7 @@ kind: ClusterRoleBinding metadata: name: {{ include "kafka-lag-exporter.fullname" . }}-strimziwatcher-clusterrolebinding labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} subjects: - kind: ServiceAccount name: {{ include "kafka-lag-exporter.fullname" . }}-serviceaccount diff --git a/charts/kafka-lag-exporter/templates/030-ConfigMap.yaml b/charts/kafka-lag-exporter/templates/030-ConfigMap.yaml index 4944162b..62b51ed5 100644 --- a/charts/kafka-lag-exporter/templates/030-ConfigMap.yaml +++ b/charts/kafka-lag-exporter/templates/030-ConfigMap.yaml @@ -3,10 +3,7 @@ kind: ConfigMap metadata: name: {{ include "kafka-lag-exporter.fullname" . }}-configmap labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} data: application.conf: | kafka-lag-exporter { diff --git a/charts/kafka-lag-exporter/templates/031-MountedSecret.yaml b/charts/kafka-lag-exporter/templates/031-MountedSecret.yaml index 0e611ce7..1dfe6e7e 100644 --- a/charts/kafka-lag-exporter/templates/031-MountedSecret.yaml +++ b/charts/kafka-lag-exporter/templates/031-MountedSecret.yaml @@ -4,10 +4,7 @@ kind: Secret metadata: name: {{ .Values.secrets.name }} labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} {{- if .Values.secretAnnotations }} annotations: {{ tpl (toYaml .Values.secretAnnotations) . | indent 4 }} diff --git a/charts/kafka-lag-exporter/templates/040-Deployment.yaml b/charts/kafka-lag-exporter/templates/040-Deployment.yaml index f585e156..32cd7b51 100644 --- a/charts/kafka-lag-exporter/templates/040-Deployment.yaml +++ b/charts/kafka-lag-exporter/templates/040-Deployment.yaml @@ -3,10 +3,7 @@ kind: Deployment metadata: name: {{ include "kafka-lag-exporter.fullname" . }} labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} {{- if .Values.deploymentExtraLabels }} {{- tpl (toYaml .Values.deploymentExtraLabels) . | nindent 4 }} {{- end }} @@ -14,13 +11,11 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- include "kafka-lag-exporter.selectorLabels" . | nindent 6 }} template: metadata: labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- include "kafka-lag-exporter.labels" . | nindent 8 }} {{- if .Values.podExtraLabels }} {{- tpl (toYaml .Values.podExtraLabels) . | nindent 8 }} {{- end }} diff --git a/charts/kafka-lag-exporter/templates/050-Service.yaml b/charts/kafka-lag-exporter/templates/050-Service.yaml index 94beae8f..ff20582d 100644 --- a/charts/kafka-lag-exporter/templates/050-Service.yaml +++ b/charts/kafka-lag-exporter/templates/050-Service.yaml @@ -3,10 +3,7 @@ kind: Service metadata: name: {{ include "kafka-lag-exporter.fullname" . }}-service labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} jobLabel: {{ include "kafka-lag-exporter.fullname" . }} {{- if .Values.service.additionalLabels }} {{ toYaml .Values.service.additionalLabels | indent 4 -}} @@ -23,5 +20,4 @@ spec: protocol: TCP name: http selector: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- include "kafka-lag-exporter.selectorLabels" . | nindent 4 }} diff --git a/charts/kafka-lag-exporter/templates/060-ServiceMonitor.yaml b/charts/kafka-lag-exporter/templates/060-ServiceMonitor.yaml index 60bed898..648f78de 100644 --- a/charts/kafka-lag-exporter/templates/060-ServiceMonitor.yaml +++ b/charts/kafka-lag-exporter/templates/060-ServiceMonitor.yaml @@ -7,10 +7,7 @@ metadata: namespace: {{ .Values.prometheus.serviceMonitor.namespace }} {{- end }} labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} {{- if .Values.prometheus.serviceMonitor.additionalLabels }} {{ toYaml .Values.prometheus.serviceMonitor.additionalLabels | indent 4 -}} {{- end }} @@ -18,9 +15,7 @@ spec: jobLabel: jobLabel selector: matchLabels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} + {{- include "kafka-lag-exporter.selectorLabels" . | nindent 6 }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/kafka-lag-exporter/templates/070-PrometheusRule.yaml b/charts/kafka-lag-exporter/templates/070-PrometheusRule.yaml index 44e53b18..15dd586f 100644 --- a/charts/kafka-lag-exporter/templates/070-PrometheusRule.yaml +++ b/charts/kafka-lag-exporter/templates/070-PrometheusRule.yaml @@ -4,10 +4,7 @@ kind: PrometheusRule metadata: name: {{ include "kafka-lag-exporter.fullname" . }} labels: - app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} - helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- include "kafka-lag-exporter.labels" . | nindent 4 }} {{- if .Values.prometheusRule.additionalLabels }} {{- toYaml .Values.prometheusRule.additionalLabels | nindent 4 -}} {{- end }} diff --git a/charts/kafka-lag-exporter/templates/_helpers.tpl b/charts/kafka-lag-exporter/templates/_helpers.tpl index d9ac6f5f..322ba58a 100644 --- a/charts/kafka-lag-exporter/templates/_helpers.tpl +++ b/charts/kafka-lag-exporter/templates/_helpers.tpl @@ -30,3 +30,23 @@ Create chart name and version as used by the chart label. {{- define "kafka-lag-exporter.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "kafka-lag-exporter.labels" -}} +helm.sh/chart: {{ include "kafka-lag-exporter.chart" . }} +{{ include "kafka-lag-exporter.selectorLabels" . }} +{{- if or .Chart.AppVersion .Values.image.tag }} +app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/component: metrics +app.kubernetes.io/part-of: {{ .Release.Name }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- if .Values.additionalLabels }} +{{ toYaml .Values.additionalLabels }} +{{- end }} +{{- end -}} + + +{{- define "kafka-lag-exporter.selectorLabels" -}} +app.kubernetes.io/name: {{ include "kafka-lag-exporter.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end -}} diff --git a/charts/kafka-lag-exporter/values.yaml b/charts/kafka-lag-exporter/values.yaml index 492232bb..ee99bfdc 100644 --- a/charts/kafka-lag-exporter/values.yaml +++ b/charts/kafka-lag-exporter/values.yaml @@ -108,6 +108,10 @@ kafkaLogLevel: INFO ## The log level of Akka akkaLogLevel: DEBUG +## Additional labels to add to all resources +additionalLabels: #{} + app: kafka-lag-exporter + ## You probably won't need to change anything below this line. image: repository: seglo/kafka-lag-exporter