services: update app.kuberntes.io/component for services (#7371)

Author: rphillips

charts/kueue/templates/_helpers.tpl

@@ -56,7 +56,31 @@ Labels for metrics service
 */}}
 {{- define "kueue.metricsService.labels" -}}
 {{ include "kueue.labels" . }}
-app.kubernetes.io/component: metrics
+app.kubernetes.io/component: metrics-service
+{{- end }}
+
+{{/*
+Labels for webhook service
+*/}}
+{{- define "kueue.webhookService.labels" -}}
+{{ include "kueue.labels" . }}
+app.kubernetes.io/component: webhook-service
+{{- end }}
+
+{{/*
+Labels for visibility service
+*/}}
+{{- define "kueue.visibilityService.labels" -}}
+{{ include "kueue.labels" . }}
+app.kubernetes.io/component: visibility-service
+{{- end }}
+
+{{/*
+Labels for controller-manager
+*/}}
+{{- define "kueue.controllerManager.labels" -}}
+{{ include "kueue.labels" . }}
+app.kubernetes.io/component: controller
 {{- end }}
 
 {{/*

charts/kueue/templates/manager/manager.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ include "kueue.fullname" . }}-controller-manager
   namespace: '{{ .Release.Namespace }}'
   labels:
-  {{- include "kueue.labels" . | nindent 4 }}
+  {{- include "kueue.controllerManager.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controllerManager.replicas }}
   selector:

charts/kueue/templates/visibility/apiservice_v1beta1.yaml

@@ -8,7 +8,7 @@ metadata:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "kueue.fullname" . }}-visibility-server-cert'
   {{- end }}
   labels:
-  {{- include "kueue.labels" . | nindent 4 }}
+  {{- include "kueue.visibilityService.labels" . | nindent 4 }}
   name: v1beta1.visibility.kueue.x-k8s.io
 spec:
   {{- if not .Values.enableCertManager }}

charts/kueue/templates/visibility/role_binding.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-  {{- include "kueue.labels" . | nindent 4 }}
+  {{- include "kueue.visibilityService.labels" . | nindent 4 }}
   name: '{{ include "kueue.fullname" . }}-visibility-server-auth-reader'
   namespace: kube-system
 roleRef:

charts/kueue/templates/visibility/service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-  {{- include "kueue.labels" . | nindent 4 }}
+  {{- include "kueue.visibilityService.labels" . | nindent 4 }}
   name: '{{ include "kueue.fullname" . }}-visibility-server'
   namespace: '{{ .Release.Namespace }}'
 spec:

charts/kueue/templates/webhook/service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-  {{- include "kueue.labels" . | nindent 4 }}
+  {{- include "kueue.webhookService.labels" . | nindent 4 }}
   name: '{{ include "kueue.fullname" . }}-webhook-service'
   namespace: '{{ .Release.Namespace }}'
 spec:

config/default/kustomization.yaml

@@ -11,7 +11,6 @@ namePrefix: kueue-
 labels:
   - pairs:
       app.kubernetes.io/name: kueue
-      app.kubernetes.io/component: controller
     includeTemplates: true
   - pairs:
       control-plane: controller-manager
@@ -52,6 +51,40 @@ patches:
 # Expose port used by the metrics service
 - path: manager_metrics_patch.yaml
 
+# Add component labels to services
+- patch: |-
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: webhook-service
+      namespace: system
+      labels:
+        app.kubernetes.io/component: webhook-service
+- patch: |-
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: visibility-server
+      namespace: kueue-system
+      labels:
+        app.kubernetes.io/component: visibility-service
+- patch: |-
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: controller-manager-metrics-service
+      namespace: system
+      labels:
+        app.kubernetes.io/component: metrics-service
+- patch: |-
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: controller-manager
+      namespace: system
+      labels:
+        app.kubernetes.io/component: controller
+
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
 # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
 # 'CERTMANAGER' needs to be enabled to use ca injection

hack/processing-plan.yaml

@@ -105,7 +105,7 @@ files:
         key: .metadata
         value: |
           labels:
-          {{- include "kueue.labels" . | nindent 4 }}
+          {{- include "kueue.visibilityService.labels" . | nindent 4 }}
         indentation: 2
       - type: INSERT_TEXT
         key: .spec
@@ -192,7 +192,7 @@ files:
         key: .metadata
         value: |
           labels:
-          {{- include "kueue.labels" . | nindent 4 }}
+          {{- include "kueue.webhookService.labels" . | nindent 4 }}
         indentation: 2
       - type: INSERT_TEXT
         key: .spec.type