Update pkg/cmd/flags.go

benoittgt · gjenkins8 · benoittgt · commit 02312a1cf212 · 2025-11-10T18:52:44.000+01:00
Co-authored-by: George Jenkins &lt;gvjenkins@gmail.com&gt;
Signed-off-by: Benoit Tigeot &lt;benoittgt@users.noreply.github.com&gt;
Signed-off-by: Benoit Tigeot &lt;benoit.tigeot@lifen.fr&gt;
diff --git a/pkg/cmd/flags.go b/pkg/cmd/flags.go
@@ -59,7 +59,7 @@ func AddWaitFlag(cmd *cobra.Command, wait *kube.WaitStrategy) {
 	cmd.Flags().Var(
 		newWaitValue(kube.HookOnlyStrategy, wait),
 		"wait",
-		"wait until resources are ready (up to --timeout). Values: 'watcher', 'hookOnly' (default), and 'legacy'",
+		"if specified, wait until resources are ready (up to --timeout). Values: 'watcher' (default), 'hookOnly', and 'legacy'.",
 	)
 	// Sets the strategy to use the watcher strategy if `--wait` is used without an argument
 	cmd.Flags().Lookup("wait").NoOptDefVal = string(kube.StatusWatcherStrategy)
diff --git a/pkg/kube/statuswait.go b/pkg/kube/statuswait.go
@@ -65,7 +65,7 @@ func (w *statusWaiter) WatchUntilReady(resourceList ResourceList, timeout time.D
 	if timeout == 0 {
 		timeout = DefaultStatusWatcherTimeout
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	ctx, cancel := w.contextWithTimeout(timeout)
 	defer cancel()
 	slog.Debug("waiting for resources", "count", len(resourceList), "timeout", timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)
@@ -86,33 +86,21 @@ func (w *statusWaiter) WatchUntilReady(resourceList ResourceList, timeout time.D
 }
 
 func (w *statusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error {
-<<<<<<< HEAD
-	ctx, cancel := w.contextWithTimeout(timeout)
-||||||| parent of 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
-=======
 	if timeout == 0 {
 		timeout = DefaultStatusWatcherTimeout
 	}
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
->>>>>>> 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
+	ctx, cancel := w.contextWithTimeout(timeout)
 	defer cancel()
 	slog.Debug("waiting for resources", "count", len(resourceList), "timeout", timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)
 	return w.wait(ctx, resourceList, sw)
 }
 
 func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error {
-<<<<<<< HEAD
-	ctx, cancel := w.contextWithTimeout(timeout)
-||||||| parent of 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
-=======
 	if timeout == 0 {
 		timeout = DefaultStatusWatcherTimeout
 	}
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
->>>>>>> 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
+	ctx, cancel := w.contextWithTimeout(timeout)
 	defer cancel()
 	slog.Debug("waiting for resources", "count", len(resourceList), "timeout", timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)
@@ -123,16 +111,10 @@ func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Dura
 }
 
 func (w *statusWaiter) WaitForDelete(resourceList ResourceList, timeout time.Duration) error {
-<<<<<<< HEAD
-	ctx, cancel := w.contextWithTimeout(timeout)
-||||||| parent of 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
-=======
 	if timeout == 0 {
 		timeout = DefaultStatusWatcherTimeout
 	}
-	ctx, cancel := context.WithTimeout(context.TODO(), timeout)
->>>>>>> 86f98f870 (Prevent surprising failure with SDK when timeout is not set)
+	ctx, cancel := w.contextWithTimeout(timeout)
 	defer cancel()
 	slog.Debug("waiting for resources to be deleted", "count", len(resourceList), "timeout", timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func AddWaitFlag(cmd cobra.Command, wait kube.WaitStrategy) {`
`59`	`59`	`cmd.Flags().Var(`
`60`	`60`	`newWaitValue(kube.HookOnlyStrategy, wait),`
`61`	`61`	`"wait",`
`62`		`- "wait until resources are ready (up to --timeout). Values: 'watcher', 'hookOnly' (default), and 'legacy'",`
	`62`	`+ "if specified, wait until resources are ready (up to --timeout). Values: 'watcher' (default), 'hookOnly', and 'legacy'.",`
`63`	`63`	`)`
`64`	`64`	// Sets the strategy to use the watcher strategy if `--wait` is used without an argument
`65`	`65`	`cmd.Flags().Lookup("wait").NoOptDefVal = string(kube.StatusWatcherStrategy)`