Remove duplication (#4215)

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

pkg/skaffold/runner/debugging.go

@@ -17,7 +17,6 @@ limitations under the License.
 package runner
 
 import (
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/debugging"
 )
 
@@ -26,8 +25,5 @@ func (r *SkaffoldRunner) createContainerManager() *debugging.ContainerManager {
 		return nil
 	}
 
-	return debugging.NewContainerManager(
-		kubectl.NewFromRunContext(r.runCtx),
-		r.podSelector,
-		r.runCtx.Namespaces)
+	return debugging.NewContainerManager(r.kubectlCLI, r.podSelector, r.runCtx.Namespaces)
 }

pkg/skaffold/runner/kind.go

@@ -48,8 +48,7 @@ func (r *SkaffoldRunner) loadImagesInKindNodes(ctx context.Context, out io.Write
 		// Only `kind load` the images that are unknown to the node
 		if knownImages == nil {
 			var err error
-			kubectlCLI := kubectl.NewFromRunContext(r.runCtx)
-			if knownImages, err = findKnownImages(ctx, kubectlCLI); err != nil {
+			if knownImages, err = findKnownImages(ctx, r.kubectlCLI); err != nil {
 				return fmt.Errorf("unable to retrieve node's images: %w", err)
 			}
 		}

pkg/skaffold/runner/kind_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/testutil"
@@ -101,14 +102,17 @@ func TestLoadImagesInKindNodes(t *testing.T) {
 		testutil.Run(t, test.description, func(t *testutil.T) {
 			t.Override(&util.DefaultExecCommand, test.commands)
 
-			r := &SkaffoldRunner{
-				builds: test.built,
-				runCtx: &runcontext.RunContext{
-					Opts: config.SkaffoldOptions{
-						Namespace: "namespace",
-					},
-					KubeContext: "kubecontext",
+			runCtx := &runcontext.RunContext{
+				Opts: config.SkaffoldOptions{
+					Namespace: "namespace",
 				},
+				KubeContext: "kubecontext",
+			}
+
+			r := &SkaffoldRunner{
+				runCtx:     runCtx,
+				kubectlCLI: kubectl.NewFromRunContext(runCtx),
+				builds:     test.built,
 			}
 			err := r.loadImagesInKindNodes(context.Background(), ioutil.Discard, test.kindCluster, test.deployed)
 

pkg/skaffold/runner/logger.go

@@ -20,7 +20,6 @@ import (
 	"io"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
 )
 
@@ -34,6 +33,5 @@ func (r *SkaffoldRunner) createLogger(out io.Writer, artifacts []build.Artifact)
 		imageNames = append(imageNames, artifact.Tag)
 	}
 
-	kubectlCLI := kubectl.NewFromRunContext(r.runCtx)
-	return kubernetes.NewLogAggregator(out, kubectlCLI, imageNames, r.podSelector, r.runCtx.Namespaces)
+	return kubernetes.NewLogAggregator(out, r.kubectlCLI, imageNames, r.podSelector, r.runCtx.Namespaces)
 }

pkg/skaffold/runner/new.go

@@ -31,6 +31,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/filemon"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -42,6 +43,8 @@ import (
 
 // NewForConfig returns a new SkaffoldRunner for a SkaffoldConfig
 func NewForConfig(runCtx *runcontext.RunContext) (*SkaffoldRunner, error) {
+	kubectlCLI := kubectl.NewFromRunContext(runCtx)
+
 	tagger, err := getTagger(runCtx)
 	if err != nil {
 		return nil, fmt.Errorf("creating tagger: %w", err)
@@ -108,6 +111,7 @@ func NewForConfig(runCtx *runcontext.RunContext) (*SkaffoldRunner, error) {
 			Trigger:    trigger,
 			intentChan: intentChan,
 		},
+		kubectlCLI: kubectlCLI,
 		changeSet: &changeSet{
 			rebuildTracker: make(map[string]*latest.Artifact),
 			resyncTracker:  make(map[string]*sync.Item),

pkg/skaffold/runner/portforwarder.go

@@ -19,7 +19,6 @@ package runner
 import (
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/portforward"
 )
 
@@ -29,7 +28,7 @@ func (r *SkaffoldRunner) createForwarder(out io.Writer) *portforward.ForwarderMa
 	}
 
 	return portforward.NewForwarderManager(out,
-		kubectl.NewFromRunContext(r.runCtx),
+		r.kubectlCLI,
 		r.podSelector,
 		r.runCtx.Namespaces,
 		r.defaultLabeller.RunIDSelector(),

pkg/skaffold/runner/runner.go

@@ -25,6 +25,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/tag"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/filemon"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -57,6 +58,7 @@ type SkaffoldRunner struct {
 	monitor  filemon.Monitor
 	listener Listener
 
+	kubectlCLI      *kubectl.CLI
 	cache           cache.Cache
 	changeSet       *changeSet
 	runCtx          *runcontext.RunContext