add timeout awaitng for deleteion

splunk · Dec 24, 2020 · c4ceba0 · c4ceba0
1 parent 6e91017
commit c4ceba0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/internal/commands/apply.go b/internal/commands/apply.go
@@ -295,6 +295,7 @@ func newApplyCommand(cp configProvider) *cobra.Command {
 		if err != nil {
 			return newUsageError(fmt.Sprintf("invalid wait timeout: %s, %v", waitTime, err))
 		}
+		config.syncOptions.WaitOptions.Timeout = config.waitTimeout
 		if config.syncOptions.DryRun {
 			config.wait = false
 			config.waitAll = false

diff --git a/internal/remote/client.go b/internal/remote/client.go
@@ -662,8 +662,13 @@ func (c *Client) doRecreate(obj model.K8sLocalObject, opts SyncOptions) (*update
 		return nil, err
 	}
 
+	waitTime := int64(opts.WaitOptions.Timeout.Seconds())
+	if waitTime == 0 {
+		waitTime = int64(2 * time.Minute)
+	}
 	watcher, err := ri.Watch(metav1.ListOptions{
-		FieldSelector: "metadata.name=" + obj.GetName(),
+		TimeoutSeconds: &waitTime,
+		FieldSelector:  "metadata.name=" + obj.GetName(),
 	})
 	if err != nil {
 		return nil, err