update kube events

hckops · Oct 23, 2023 · 9a45659 · 9a45659
1 parent 01597be
commit 9a45659
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/pkg/box/kubernetes/events.go b/pkg/box/kubernetes/events.go
@@ -104,10 +104,6 @@ func newPodLogsExitKubeConsoleEvent() *kubeBoxEvent {
 	return &kubeBoxEvent{kind: event.LoaderUpdate, value: "killing"}
 }
 
-func newPodLogsErrorKubeEvent(namespace string, name string, err error) *kubeBoxEvent {
-	return &kubeBoxEvent{kind: event.LogError, value: fmt.Sprintf("pod logs error: namespace=%s name=%s error=%v", namespace, name, err)}
-}
-
 func newPodPortForwardIgnoreKubeEvent(namespace string, name string) *kubeBoxEvent {
 	return &kubeBoxEvent{kind: event.LogWarning, value: fmt.Sprintf("pod port-forward ignored: namespace=%s name=%s", namespace, name)}
 }

diff --git a/pkg/box/kubernetes/kubernetes.go b/pkg/box/kubernetes/kubernetes.go
@@ -214,6 +214,10 @@ func (box *KubeBoxClient) execBox(template *boxModel.BoxV1, info *boxModel.BoxIn
 		return box.logsBox(template, info, streamOpts, deleteOnExit)
 	}
 
+	if deleteOnExit {
+		defer box.deleteBox(info.Name)
+	}
+
 	// exec
 	opts := &kubernetes.PodExecOpts{
 		Namespace:     box.clientOpts.Namespace,
@@ -229,11 +233,6 @@ func (box *KubeBoxClient) execBox(template *boxModel.BoxV1, info *boxModel.BoxIn
 			box.eventBus.Publish(newPodExecKubeLoaderEvent())
 		},
 	}
-
-	if deleteOnExit {
-		defer box.deleteBox(info.Name)
-	}
-
 	box.eventBus.Publish(newPodExecKubeEvent(template.Name, box.clientOpts.Namespace, info.Id, template.Shell))
 	return box.client.PodExecShell(opts)
 }