helm: improve labels and selector labels set on the DaemonSet

Improve the usage of labels and selector logic in accordance with Helm best practices for Balloons and TA plugins. Signed-off-by: Feruzjon Muyassarov <[email protected]>
containers · Oct 5, 2023 · abafe68 · abafe68
1 parent 325cfbf
commit abafe68
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/deployment/helm/resource-management-policies/balloons/templates/_helpers.tpl b/deployment/helm/resource-management-policies/balloons/templates/_helpers.tpl
@@ -2,7 +2,15 @@
 Common labels
 */}}
 {{- define "balloons-plugin.labels" -}}
-app: nri-resource-policy-balloons
-app.kubernetes.io/instance: {{ .Release.Name }}
+helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "balloons-plugin.selectorLabels" . }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "balloons-plugin.selectorLabels" -}}
+app.kubernetes.io/name: nri-resource-policy-balloons
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/deployment/helm/resource-management-policies/balloons/templates/daemonset.yaml b/deployment/helm/resource-management-policies/balloons/templates/daemonset.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-    {{- include "balloons-plugin.labels" . | nindent 6 }}
+    {{- include "balloons-plugin.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:

diff --git a/deployment/helm/resource-management-policies/topology-aware/templates/_helpers.tpl b/deployment/helm/resource-management-policies/topology-aware/templates/_helpers.tpl
@@ -2,7 +2,15 @@
 Common labels
 */}}
 {{- define "topology-aware-plugin.labels" -}}
-app: nri-resource-policy-topology-aware
-app.kubernetes.io/instance: {{ .Release.Name }}
+helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "topology-aware-plugin.selectorLabels" . }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "topology-aware-plugin.selectorLabels" -}}
+app.kubernetes.io/name: nri-resource-policy-topology-aware
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/deployment/helm/resource-management-policies/topology-aware/templates/daemonset.yaml b/deployment/helm/resource-management-policies/topology-aware/templates/daemonset.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-    {{- include "topology-aware-plugin.labels" . | nindent 6 }}
+    {{- include "topology-aware-plugin.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels: