Use same image as driver in rendered templates

Signed-off-by: Kevin Klues <[email protected]>

Author: klueska

cmd/compute-domain-controller/controller.go

@@ -35,6 +35,9 @@ type ManagerConfig struct {
 	// driverNamespace is the Kubernetes namespace where the driver operates
 	driverNamespace string
 
+	// imageName is the full image name to use when rendering templates
+	imageName string
+
 	// clientsets provides access to various Kubernetes API client interfaces
 	clientsets flags.ClientSets
 
@@ -62,6 +65,7 @@ func (c *Controller) Run(ctx context.Context) error {
 	managerConfig := &ManagerConfig{
 		driverName:      c.config.driverName,
 		driverNamespace: c.config.flags.namespace,
+		imageName:       c.config.flags.imageName,
 		clientsets:      c.config.clientsets,
 		workQueue:       workQueue,
 	}

cmd/compute-domain-controller/daemonset.go

@@ -48,6 +48,7 @@ type DaemonSetTemplateData struct {
 	ComputeDomainLabelKey     string
 	ComputeDomainLabelValue   types.UID
 	ResourceClaimTemplateName string
+	ImageName                 string
 }
 
 type DaemonSetManager struct {
@@ -180,6 +181,7 @@ func (m *DaemonSetManager) Create(ctx context.Context, namespace string, cd *nva
 		ComputeDomainLabelKey:     computeDomainLabelKey,
 		ComputeDomainLabelValue:   cd.UID,
 		ResourceClaimTemplateName: rct.Name,
+		ImageName:                 m.config.imageName,
 	}
 
 	tmpl, err := template.ParseFiles(DaemonSetTemplatePath)

cmd/compute-domain-controller/main.go

@@ -52,6 +52,7 @@ type Flags struct {
 
 	podName   string
 	namespace string
+	imageName string
 
 	httpEndpoint string
 	metricsPath  string
@@ -91,6 +92,13 @@ func newApp() *cli.App {
 			Destination: &flags.namespace,
 			EnvVars:     []string{"NAMESPACE"},
 		},
+		&cli.StringFlag{
+			Name:        "image-name",
+			Usage:       "The full image name to use for rendering templates.",
+			Required:    true,
+			Destination: &flags.imageName,
+			EnvVars:     []string{"IMAGE_NAME"},
+		},
 		&cli.StringFlag{
 			Category:    "HTTP server:",
 			Name:        "http-endpoint",

cmd/gpu-kubelet-plugin/main.go

@@ -47,6 +47,7 @@ type Flags struct {
 	containerDriverRoot string
 	hostDriverRoot      string
 	nvidiaCTKPath       string
+	imageName           string
 }
 
 type Config struct {
@@ -109,6 +110,13 @@ func newApp() *cli.App {
 			Destination: &flags.nvidiaCTKPath,
 			EnvVars:     []string{"NVIDIA_CTK_PATH"},
 		},
+		&cli.StringFlag{
+			Name:        "image-name",
+			Usage:       "The full image name to use for rendering templates.",
+			Required:    true,
+			Destination: &flags.imageName,
+			EnvVars:     []string{"IMAGE_NAME"},
+		},
 	}
 	cliFlags = append(cliFlags, flags.kubeClientConfig.Flags()...)
 	cliFlags = append(cliFlags, flags.loggingConfig.Flags()...)

cmd/gpu-kubelet-plugin/sharing.go

@@ -92,6 +92,7 @@ type MpsControlDaemonTemplateData struct {
 	MpsShmDirectory                 string
 	MpsPipeDirectory                string
 	MpsLogDirectory                 string
+	MpsImageName                    string
 }
 
 func NewTimeSlicingManager(deviceLib *deviceLib) *TimeSlicingManager {
@@ -206,6 +207,7 @@ func (m *MpsControlDaemon) Start(ctx context.Context, config *configapi.MpsConfi
 		MpsShmDirectory:                 m.shmDir,
 		MpsPipeDirectory:                m.pipeDir,
 		MpsLogDirectory:                 m.logDir,
+		MpsImageName:                    m.manager.config.flags.imageName,
 	}
 
 	if config != nil && config.DefaultActiveThreadPercentage != nil {

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

@@ -64,6 +64,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: IMAGE_NAME
+          value: {{ include "nvidia-dra-driver-gpu.fullimage" . }}
       {{- with .Values.controller.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

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

@@ -150,6 +150,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: IMAGE_NAME
+          value: {{ include "nvidia-dra-driver-gpu.fullimage" . }}
         volumeMounts:
         - name: plugins-registry
           mountPath: /var/lib/kubelet/plugins_registry

templates/compute-domain-daemon.tmpl.yaml

@@ -22,7 +22,7 @@ spec:
         {{ .ComputeDomainLabelKey }}: {{ .ComputeDomainLabelValue }}
       containers:
       - name: compute-domain-daemon
-        image: ubuntu:22.04
+        image: {{ .ImageName }}
         command: [sh, -c]
         args:
         - |-

templates/mps-control-daemon.tmpl.yaml

@@ -20,7 +20,7 @@ spec:
       hostPID: true
       containers:
       - name: mps-control-daemon
-        image: ubuntu:22.04
+        image: {{ .MpsImageName }}
         securityContext:
           privileged: true
         command: [chroot, /driver-root, sh, -c]