[stable/k8s-event-logger]: Enhance Helm Chart with Consistent Naming …

…and Labeling Conventions (#605) * Enhance Helm Chart with Consistent Naming and Labeling Conventions * fixing tab space on deployment * adding selector labels --------- Co-authored-by: Chris Larson <chris.larson@futurenet.com>
deliveryhero · Sep 25, 2024 · 618e781 · 618e781
1 parent b648d8b
commit 618e781
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/stable/k8s-event-logger/Chart.yaml b/stable/k8s-event-logger/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: "2.1"
-version: "1.1.6"
+version: "1.1.7"
 description: |
   This chart runs a pod that simply watches Kubernetes Events and logs them to stdout in JSON to be collected and stored by your logging solution, e.g. [fluentd](https://github.com/helm/charts/tree/master/stable/fluentd) or [fluent-bit](https://github.com/helm/charts/tree/master/stable/fluent-bit).
 

diff --git a/stable/k8s-event-logger/README.md b/stable/k8s-event-logger/README.md
@@ -1,6 +1,6 @@
 # k8s-event-logger
 
-![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![AppVersion: 2.1](https://img.shields.io/badge/AppVersion-2.1-informational?style=flat-square)
+![Version: 1.1.7](https://img.shields.io/badge/Version-1.1.7-informational?style=flat-square) ![AppVersion: 2.1](https://img.shields.io/badge/AppVersion-2.1-informational?style=flat-square)
 
 This chart runs a pod that simply watches Kubernetes Events and logs them to stdout in JSON to be collected and stored by your logging solution, e.g. [fluentd](https://github.com/helm/charts/tree/master/stable/fluentd) or [fluent-bit](https://github.com/helm/charts/tree/master/stable/fluent-bit).
 

diff --git a/stable/k8s-event-logger/templates/_helpers.tpl b/stable/k8s-event-logger/templates/_helpers.tpl
@@ -36,11 +36,20 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "k8s-event-logger.labels" -}}
-app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
 helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+
+
+{{/*
+Selector labels
+*/}}
+{{- define "k8s-event-logger.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/stable/k8s-event-logger/templates/clusterrole.yaml b/stable/k8s-event-logger/templates/clusterrole.yaml
@@ -4,9 +4,7 @@ metadata:
   name: {{ include "k8s-event-logger.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-    helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "k8s-event-logger.labels" . | nindent 4 }}
 rules:
 - apiGroups: [""]
   resources: ["events"]

diff --git a/stable/k8s-event-logger/templates/clusterrolebinding.yaml b/stable/k8s-event-logger/templates/clusterrolebinding.yaml
@@ -4,9 +4,7 @@ metadata:
   name: {{ include "k8s-event-logger.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-    helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "k8s-event-logger.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/stable/k8s-event-logger/templates/deployment.yaml b/stable/k8s-event-logger/templates/deployment.yaml
@@ -12,8 +12,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "k8s-event-logger.selectorLabels" . | nindent 6 }}
   template:
     metadata:
 {{- with .Values.podAnnotations }}
@@ -22,7 +21,7 @@ spec:
 {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- include "k8s-event-logger.labels" . | nindent 8 }}
 {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}