feat(helm): Refactoring Kubernetes recommended labels

operations/helm/charts/alloy/CHANGELOG.md

@@ -7,6 +7,16 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+Unreleased
+----------
+
+0.2.0 (2024-05-08)
+------------------
+
+### Other changes
+
+- Support all [Kubernetes recommended labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/) (@nlamirault)
+
 0.1.1 (2024-04-11)
 ------------------
 

operations/helm/charts/alloy/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: alloy
 description: 'Grafana Alloy'
 type: application
-version: 0.1.1
+version: 0.2.0
 appVersion: 'v1.0.0'
 icon: https://raw.githubusercontent.com/grafana/alloy/main/docs/sources/assets/alloy_icon_orange.svg
 

operations/helm/charts/alloy/README.md

@@ -1,6 +1,6 @@
 # Grafana Alloy Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Alloy][] to Kubernetes.
 

operations/helm/charts/alloy/templates/_helpers.tpl

@@ -60,6 +60,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
     For digests, we crop the string to a 7-char (short) sha. */}}
 app.kubernetes.io/version: {{ (include "alloy.imageId" .) | trunc 15 | trimPrefix "@sha256" | trimPrefix ":" | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: alloy
 {{- end }}
 {{- end }}
 

operations/helm/charts/alloy/templates/cluster_service.yaml

@@ -6,6 +6,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}-cluster
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   clusterIP: 'None'

operations/helm/charts/alloy/templates/configmap.yaml

@@ -6,6 +6,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 data:
   {{- if $values.configMap.content }}
   config.alloy: |- {{- (tpl  $values.configMap.content .) | nindent 4 }}

operations/helm/charts/alloy/templates/hpa.yaml

@@ -18,6 +18,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: availability
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

operations/helm/charts/alloy/templates/ingress.yaml

@@ -14,6 +14,7 @@ metadata:
   namespace: {{ include "alloy.namespace" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
     {{- with .Values.ingress.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

operations/helm/charts/alloy/templates/rbac.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -92,13 +93,13 @@ rules:
     verbs: ["get", "list", "watch"]
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/charts/alloy/templates/service.yaml

@@ -6,6 +6,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: networking
   {{- with .Values.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

operations/helm/charts/alloy/templates/serviceaccount.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: rbac
     {{- with .Values.serviceAccount.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

operations/helm/charts/alloy/templates/servicemonitor.yaml

@@ -6,6 +6,7 @@ metadata:
   name: {{ include "alloy.fullname" . }}
   labels:
     {{- include "alloy.labels" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
     {{- with .Values.serviceMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

operations/helm/tests/additional-serviceaccount-label/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/additional-serviceaccount-label/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/additional-serviceaccount-label/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/additional-serviceaccount-label/alloy/templates/serviceaccount.yaml

@@ -11,4 +11,5 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
     test: "true"

operations/helm/tests/clustering/alloy/templates/cluster_service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   clusterIP: 'None'

operations/helm/tests/clustering/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/clustering/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/clustering/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/clustering/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac

operations/helm/tests/controller-volumes-extra/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/controller-volumes-extra/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/controller-volumes-extra/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/controller-volumes-extra/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/create-daemonset-hostnetwork/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac

operations/helm/tests/create-daemonset/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/create-daemonset/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/create-daemonset/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/create-daemonset/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac

operations/helm/tests/create-deployment-autoscaling/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/create-deployment-autoscaling/alloy/templates/hpa.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: availability
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

operations/helm/tests/create-deployment-autoscaling/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/create-deployment-autoscaling/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/create-deployment-autoscaling/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac

operations/helm/tests/create-deployment/alloy/templates/configmap.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: config
 data:
   config.alloy: |-
     logging {

operations/helm/tests/create-deployment/alloy/templates/rbac.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 rules:
   # Rules which allow discovery.kubernetes to function.
   - apiGroups:
@@ -107,6 +108,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

operations/helm/tests/create-deployment/alloy/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: networking
 spec:
   type: ClusterIP
   selector:

operations/helm/tests/create-deployment/alloy/templates/serviceaccount.yaml

@@ -11,3 +11,4 @@ metadata:
     app.kubernetes.io/instance: alloy
     app.kubernetes.io/version: "vX.Y.Z"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: rbac