From e044be2bc7a9511cfc2a628b28733f446a48c38a Mon Sep 17 00:00:00 2001
From: Rami Berman <rami.berman@up9.com>
Date: Sun, 31 Oct 2021 16:55:49 +0200
Subject: [PATCH] Update k8sTapManager.go, provider.go, and watch.go

---
 shared/kubernetes/k8sTapManager.go | 5 +++--
 shared/kubernetes/provider.go      | 2 --
 shared/kubernetes/watch.go         | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shared/kubernetes/k8sTapManager.go b/shared/kubernetes/k8sTapManager.go
index 06dab49fd..4e3dc3b1e 100644
--- a/shared/kubernetes/k8sTapManager.go
+++ b/shared/kubernetes/k8sTapManager.go
@@ -20,7 +20,7 @@ type TappedPodChangeEvent struct {
 	Removed []core.Pod
 }
 
-// MizuTapperSyncer syncs tappers using a k8s pod watch
+// MizuTapperSyncer uses a k8s pod watch to update tapper daemonsets when targeted pods are removed or created
 type MizuTapperSyncer struct {
 	context             context.Context
 	CurrentlyTappedPods []core.Pod
@@ -28,7 +28,7 @@ type MizuTapperSyncer struct {
 	kubernetesProvider  *Provider
 	TapPodChangesOut    chan TappedPodChangeEvent
 	ErrorOut            chan K8sTapManagerError
-	shouldUpdateTappers bool // used to prevent updating tapper daemonsets before api is available but still get targeted pod change events
+	shouldUpdateTappers bool // Used to prevent daemonset updates but still allow tracking targeted pods
 }
 
 type TapperSyncerConfig struct {
@@ -155,6 +155,7 @@ func (tapperSyncer *MizuTapperSyncer) watchPodsForTapping() {
 		case <-tapperSyncer.context.Done():
 			logger.Log.Debugf("Watching pods loop, context done, stopping `restart tappers debouncer`")
 			restartTappersDebouncer.Cancel()
+			// TODO: Does this also perform cleanup?
 			return
 		}
 	}
diff --git a/shared/kubernetes/provider.go b/shared/kubernetes/provider.go
index bccdcf1d7..0a9a057bf 100644
--- a/shared/kubernetes/provider.go
+++ b/shared/kubernetes/provider.go
@@ -765,8 +765,6 @@ func validateNotProxy(kubernetesConfig clientcmd.ClientConfig, restClientConfig
 
 		if *proxyServerVersion == (version.Info{}) {
 			return &ClusterBehindProxyError{}
-			// TODO: handle this with CLI from outside the function, or move to outside or shared
-			//return fmt.Errorf("cannot establish http-proxy connection to the Kubernetes cluster. If you’re using Lens or similar tool, please run mizu with regular kubectl config using --%v %v=$HOME/.kube/config flag", "set", "kube-config-path")
 		}
 	}
 
diff --git a/shared/kubernetes/watch.go b/shared/kubernetes/watch.go
index 58460f584..9bd47ebe4 100644
--- a/shared/kubernetes/watch.go
+++ b/shared/kubernetes/watch.go
@@ -28,7 +28,7 @@ func FilteredWatch(ctx context.Context, kubernetesProvider *Provider, targetName
 
 		go func(targetNamespace string) {
 			defer wg.Done()
-			watchRestartDebouncer := debounce.NewDebouncer(1*time.Minute, func() {})
+			watchRestartDebouncer := debounce.NewDebouncer(1 * time.Minute, func() {})
 
 			for {
 				watcher := kubernetesProvider.GetPodWatcher(ctx, targetNamespace)
@@ -36,7 +36,7 @@ func FilteredWatch(ctx context.Context, kubernetesProvider *Provider, targetName
 				watcher.Stop()
 
 				select {
-				case <-ctx.Done():
+				case <- ctx.Done():
 					return
 				default:
 					break