Add label app:nvidia-dra-driver-gpu to all project components

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

cmd/compute-domain-controller/controller.go

@@ -29,6 +29,9 @@ import (
 // It contains essential fields for driver identification, Kubernetes client access,
 // and work queue management.
 type ManagerConfig struct {
+	// chartName is the Helm chart name to use for the app label value
+	chartName string
+
 	// driverName is the unique identifier for this DRA driver
 	driverName string
 
@@ -63,6 +66,7 @@ func (c *Controller) Run(ctx context.Context) error {
 	workQueue := workqueue.New(workqueue.DefaultControllerRateLimiter())
 
 	managerConfig := &ManagerConfig{
+		chartName:       c.config.flags.chartName,
 		driverName:      c.config.driverName,
 		driverNamespace: c.config.flags.namespace,
 		imageName:       c.config.flags.imageName,

cmd/compute-domain-controller/daemonset.go

@@ -47,6 +47,7 @@ type DaemonSetTemplateData struct {
 	Finalizer                 string
 	ComputeDomainLabelKey     string
 	ComputeDomainLabelValue   types.UID
+	AppLabelValue             string
 	ResourceClaimTemplateName string
 	ImageName                 string
 }
@@ -180,6 +181,7 @@ func (m *DaemonSetManager) Create(ctx context.Context, namespace string, cd *nva
 		Finalizer:                 computeDomainFinalizer,
 		ComputeDomainLabelKey:     computeDomainLabelKey,
 		ComputeDomainLabelValue:   cd.UID,
+		AppLabelValue:             m.config.chartName,
 		ResourceClaimTemplateName: rct.Name,
 		ImageName:                 m.config.imageName,
 	}

cmd/compute-domain-controller/main.go

@@ -53,6 +53,7 @@ type Flags struct {
 	podName   string
 	namespace string
 	imageName string
+	chartName string
 
 	httpEndpoint string
 	metricsPath  string
@@ -99,6 +100,14 @@ func newApp() *cli.App {
 			Destination: &flags.imageName,
 			EnvVars:     []string{"IMAGE_NAME"},
 		},
+		&cli.StringFlag{
+			Name:        "chart-name",
+			Usage:       "The Helm chart name to use for the app label value.",
+			Required:    true,
+			Destination: &flags.chartName,
+			Value:       "nvidia-dra-driver-gpu",
+			EnvVars:     []string{"HELM_CHART_NAME"},
+		},
 		&cli.StringFlag{
 			Category:    "HTTP server:",
 			Name:        "http-endpoint",

cmd/compute-domain-controller/resourceclaimtemplate.go

@@ -49,6 +49,7 @@ type ResourceClaimTemplateTemplateData struct {
 	Finalizer               string
 	ComputeDomainLabelKey   string
 	ComputeDomainLabelValue types.UID
+	AppLabelValue           string
 	TargetLabelKey          string
 	TargetLabelValue        string
 	DeviceClassName         string
@@ -298,6 +299,7 @@ func (m *DaemonSetResourceClaimTemplateManager) Create(ctx context.Context, name
 		Finalizer:               computeDomainFinalizer,
 		ComputeDomainLabelKey:   computeDomainLabelKey,
 		ComputeDomainLabelValue: cd.UID,
+		AppLabelValue:           m.config.chartName,
 		TargetLabelKey:          computeDomainResourceClaimTemplateTargetLabelKey,
 		TargetLabelValue:        computeDomainResourceClaimTemplateTargetDaemon,
 		DeviceClassName:         computeDomainDaemonDeviceClass,
@@ -356,6 +358,7 @@ func (m *WorkloadResourceClaimTemplateManager) Create(ctx context.Context, names
 		Namespace:               namespace,
 		Name:                    name,
 		Finalizer:               computeDomainFinalizer,
+		AppLabelValue:           m.config.chartName,
 		ComputeDomainLabelKey:   computeDomainLabelKey,
 		ComputeDomainLabelValue: cd.UID,
 		TargetLabelKey:          computeDomainResourceClaimTemplateTargetLabelKey,

cmd/gpu-kubelet-plugin/main.go

@@ -48,6 +48,7 @@ type Flags struct {
 	hostDriverRoot      string
 	nvidiaCTKPath       string
 	imageName           string
+	chartName           string
 }
 
 type Config struct {
@@ -117,6 +118,14 @@ func newApp() *cli.App {
 			Destination: &flags.imageName,
 			EnvVars:     []string{"IMAGE_NAME"},
 		},
+		&cli.StringFlag{
+			Name:        "chart-name",
+			Usage:       "The Helm chart name to use for the app label value.",
+			Required:    true,
+			Destination: &flags.chartName,
+			Value:       "nvidia-dra-driver-gpu",
+			EnvVars:     []string{"HELM_CHART_NAME"},
+		},
 	}
 	cliFlags = append(cliFlags, flags.kubeClientConfig.Flags()...)
 	cliFlags = append(cliFlags, flags.loggingConfig.Flags()...)

cmd/gpu-kubelet-plugin/sharing.go

@@ -85,6 +85,7 @@ type MpsControlDaemonTemplateData struct {
 	NodeName                        string
 	MpsControlDaemonNamespace       string
 	MpsControlDaemonName            string
+	AppLabelValue                   string
 	CUDA_VISIBLE_DEVICES            string //nolint:stylecheck
 	DefaultActiveThreadPercentage   string
 	DefaultPinnedDeviceMemoryLimits map[string]string
@@ -200,6 +201,7 @@ func (m *MpsControlDaemon) Start(ctx context.Context, config *configapi.MpsConfi
 		NodeName:                        m.nodeName,
 		MpsControlDaemonNamespace:       m.namespace,
 		MpsControlDaemonName:            m.name,
+		AppLabelValue:                   m.manager.config.flags.chartName,
 		CUDA_VISIBLE_DEVICES:            strings.Join(deviceUUIDs, ","),
 		DefaultActiveThreadPercentage:   "",
 		DefaultPinnedDeviceMemoryLimits: nil,

deployments/helm/nvidia-dra-driver-gpu/templates/controller.yaml

@@ -20,6 +20,7 @@ metadata:
   name: {{ include "nvidia-dra-driver-gpu.name" . }}-controller
   namespace: {{ include "nvidia-dra-driver-gpu.namespace" . }}
   labels:
+    app: {{ .Chart.Name }}
     {{- include "nvidia-dra-driver-gpu.labels" . | nindent 4 }}
 spec:
   replicas: 1
@@ -66,6 +67,8 @@ spec:
               fieldPath: metadata.namespace
         - name: IMAGE_NAME
           value: {{ include "nvidia-dra-driver-gpu.fullimage" . }}
+        - name: HELM_CHART_NAME
+          value: {{ .Chart.Name }}
       {{- with .Values.controller.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deployments/helm/nvidia-dra-driver-gpu/templates/kubeletplugin.yaml

@@ -20,6 +20,7 @@ metadata:
   name: {{ include "nvidia-dra-driver-gpu.name" . }}-kubelet-plugin
   namespace: {{ include "nvidia-dra-driver-gpu.namespace" . }}
   labels:
+    app: {{ .Chart.Name }}
     {{- include "nvidia-dra-driver-gpu.labels" . | nindent 4 }}
 spec:
   selector:
@@ -72,6 +73,8 @@ spec:
         resources:
           {{- toYaml .Values.kubeletPlugin.containers.computeDomains.resources | nindent 10 }}
         env:
+        - name: HELM_CHART_NAME
+          value: {{ .Chart.Name }}
         - name: MASK_NVIDIA_DRIVER_PARAMS
           value: "{{ .Values.maskNvidiaDriverParams }}"
         - name: NVIDIA_CTK_PATH

templates/compute-domain-daemon-claim-template.tmpl.yaml

@@ -7,6 +7,7 @@ metadata:
   finalizers:
     - {{ .Finalizer }}
   labels:
+    app: {{ .AppLabelValue }}
     {{ .ComputeDomainLabelKey }}: {{ .ComputeDomainLabelValue }}
     {{ .TargetLabelKey }}: {{ .TargetLabelValue }}
 spec:

templates/compute-domain-daemon.tmpl.yaml

@@ -7,6 +7,7 @@ metadata:
   finalizers:
     - {{ .Finalizer }}
   labels:
+    app: {{ .AppLabelValue }}
     {{ .ComputeDomainLabelKey }}: {{ .ComputeDomainLabelValue }}
 spec:
   selector: