fix: Honour 'ctrl+c' in the UI progress model

Also, fixes a minor bug in deployment deletion
minio · May 4, 2023 · 1b8376e · 1b8376e
1 parent 5c14dd1
commit 1b8376e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cmd/kubectl-directpv/progress_model.go b/cmd/kubectl-directpv/progress_model.go
@@ -82,6 +82,11 @@ func (m progressModel) Init() tea.Cmd {
 
 func (m progressModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		if msg.String() == "ctrl+c" {
+			return m, tea.Batch(tea.Sequence(finalPause(), tea.Quit))
+		}
+		return m, nil
 	case tea.WindowSizeMsg:
 		if m.model != nil {
 			m.model.Width = msg.Width - padding*2 - 4

diff --git a/pkg/installer/deployment.go b/pkg/installer/deployment.go
@@ -275,7 +275,11 @@ func doDeleteDeployment(ctx context.Context, name string) error {
 		return err
 	}
 
-	return deploymentClient.Delete(ctx, name, metav1.DeleteOptions{})
+	if err = deploymentClient.Delete(ctx, name, metav1.DeleteOptions{}); err != nil && !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	return nil
 }
 
 func deleteDeployment(ctx context.Context) error {