From 9e4eee05c954451090cf8dd3e2ac7db9c1946432 Mon Sep 17 00:00:00 2001 From: Youssef Omar Bouden Date: Wed, 28 Oct 2026 12:30:39 +0100 Subject: [PATCH] fix(driver): default the unset fields of a partial startupProbe getDriverSpec applied the operator's default startupProbe only when the whole spec.StartupProbe was nil. A partially specified startupProbe (for example only initialDelaySeconds) rendered explicit zeros into the driver DaemonSet for the fields left unset, so the API server substituted the generic Kubernetes probe defaults (failureThreshold 3, periodSeconds 10, timeoutSeconds 1) in place of the operator's longer driver-startup window, which can restart-loop a driver that is still compiling. Fill the unset fields from the defaults, matching setContainerProbe on the ClusterPolicy path. Signed-off-by: Youssef Omar Bouden --- internal/state/driver.go | 25 ++++++++++++++++ internal/state/driver_sync_test.go | 46 ++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/internal/state/driver.go b/internal/state/driver.go index 0f2f54e0e3..c17d7370d7 100644 --- a/internal/state/driver.go +++ b/internal/state/driver.go @@ -548,6 +548,29 @@ func getDefaultStartupProbe(spec *nvidiav1alpha1.NVIDIADriverSpec) *nvidiav1alph } } +// applyStartupProbeDefaults fills unset (zero) fields of a user-specified startup probe with the operator +// defaults. A partially specified startupProbe otherwise renders explicit zeros into the driver DaemonSet, +// and the API server then substitutes the generic Kubernetes probe defaults (failureThreshold 3, +// periodSeconds 10, timeoutSeconds 1) in place of the operator's longer driver-startup window, which can +// restart-loop a driver that is still compiling. This mirrors setContainerProbe on the ClusterPolicy path. +func applyStartupProbeDefaults(probe, defaults *nvidiav1alpha1.ContainerProbeSpec) { + if probe.InitialDelaySeconds == 0 { + probe.InitialDelaySeconds = defaults.InitialDelaySeconds + } + if probe.TimeoutSeconds == 0 { + probe.TimeoutSeconds = defaults.TimeoutSeconds + } + if probe.PeriodSeconds == 0 { + probe.PeriodSeconds = defaults.PeriodSeconds + } + if probe.SuccessThreshold == 0 { + probe.SuccessThreshold = defaults.SuccessThreshold + } + if probe.FailureThreshold == 0 { + probe.FailureThreshold = defaults.FailureThreshold + } +} + func getDriverImagePath(spec *nvidiav1alpha1.NVIDIADriverSpec, nodePool nodePool) (string, error) { os := nodePool.osTag @@ -595,6 +618,8 @@ func getDriverSpec(cr *nvidiav1alpha1.NVIDIADriver, nodePool nodePool) (*driverS if spec.StartupProbe == nil { spec.StartupProbe = getDefaultStartupProbe(spec) + } else { + applyStartupProbeDefaults(spec.StartupProbe, getDefaultStartupProbe(spec)) } spec.Labels = sanitizeDriverLabels(spec.Labels) diff --git a/internal/state/driver_sync_test.go b/internal/state/driver_sync_test.go index 084d6ba5f1..27d9f296b9 100644 --- a/internal/state/driver_sync_test.go +++ b/internal/state/driver_sync_test.go @@ -418,6 +418,52 @@ func TestGetDriverSpecErrors(t *testing.T) { }) } +func TestGetDriverSpecStartupProbeDefaults(t *testing.T) { + newDriverCR := func(probe *nvidiav1alpha1.ContainerProbeSpec) *nvidiav1alpha1.NVIDIADriver { + return &nvidiav1alpha1.NVIDIADriver{ + ObjectMeta: metav1.ObjectMeta{Name: "driver-a"}, + Spec: nvidiav1alpha1.NVIDIADriverSpec{ + DriverType: nvidiav1alpha1.GPU, + Repository: "nvcr.io/nvidia", + Image: "driver", + Version: "535.104.05", + Manager: nvidiav1alpha1.DriverManagerSpec{ + Repository: "nvcr.io/nvidia/cloud-native", + Image: "k8s-driver-manager", + Version: "v0.6.0", + }, + StartupProbe: probe, + }, + } + } + + testCases := map[string]struct { + startupProbe *nvidiav1alpha1.ContainerProbeSpec + expected *nvidiav1alpha1.ContainerProbeSpec + }{ + "nil startup probe uses all operator defaults": { + startupProbe: nil, + expected: &nvidiav1alpha1.ContainerProbeSpec{ + InitialDelaySeconds: 60, TimeoutSeconds: 60, PeriodSeconds: 10, SuccessThreshold: 1, FailureThreshold: 120, + }, + }, + "partial startup probe keeps set fields and defaults the rest": { + startupProbe: &nvidiav1alpha1.ContainerProbeSpec{InitialDelaySeconds: 120}, + expected: &nvidiav1alpha1.ContainerProbeSpec{ + InitialDelaySeconds: 120, TimeoutSeconds: 60, PeriodSeconds: 10, SuccessThreshold: 1, FailureThreshold: 120, + }, + }, + } + + for name, tc := range testCases { + t.Run(name, func(t *testing.T) { + spec, err := getDriverSpec(newDriverCR(tc.startupProbe), nodePool{osTag: "ubuntu22.04"}) + require.NoError(t, err) + assert.Equal(t, tc.expected, spec.Spec.StartupProbe) + }) + } +} + func TestHandleDefaultImagesInObjectsManagerImageSet(t *testing.T) { scheme := driverTestScheme(t) driverState := newTestStateDriver(t, newDriverFakeClient(scheme), scheme)