k8s: remove container runtime loading from the boot sequence (#6274)

this should make tilt faster to load when connecting to a remote or non-responsive k8s cluster fixes #6265 Signed-off-by: Nick Santos <nick.santos@docker.com>
tilt-dev · Dec 4, 2023 · 43f9c6a · 43f9c6a
1 parent 825240f
commit 43f9c6a
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 103 deletions.
diff --git a/internal/build/test_utils.go b/internal/build/test_utils.go
@@ -49,7 +49,9 @@ func newDockerBuildFixture(t testing.TB) *dockerBuildFixture {
 	ctx, _, _ := testutils.CtxAndAnalyticsForTest()
 	env := clusterid.ProductGKE
 
-	dEnv := docker.ProvideClusterEnv(ctx, docker.RealClientCreator{}, "gke", env, wmcontainer.RuntimeDocker, k8s.FakeMinikube{})
+	kCli := k8s.NewFakeK8sClient(t)
+	kCli.Runtime = wmcontainer.RuntimeDocker
+	dEnv := docker.ProvideClusterEnv(ctx, docker.RealClientCreator{}, "gke", env, kCli, k8s.FakeMinikube{})
 	dCli := docker.NewDockerClient(ctx, docker.Env(dEnv))
 	_, ok := dCli.(*docker.Cli)
 	// If it wasn't an actual Docker client, it's an exploding client

diff --git a/internal/cli/doctor.go b/internal/cli/doctor.go
@@ -137,7 +137,7 @@ func (c *doctorCmd) run(ctx context.Context, args []string) error {
 	ns, err := wireNamespace(ctx)
 	printField("Namespace", ns, err)
 
-	runtime, err := wireRuntime(ctx)
+	runtime, err := containerRuntime(ctx)
 	printField("Container Runtime", runtime, err)
 
 	kVersion, err := wireK8sVersion(ctx)
@@ -168,6 +168,14 @@ func (c *doctorCmd) run(ctx context.Context, args []string) error {
 	return nil
 }
 
+func containerRuntime(ctx context.Context) (container.Runtime, error) {
+	kClient, err := wireK8sClient(ctx)
+	if err != nil {
+		return "", err
+	}
+	return kClient.ContainerRuntime(ctx), nil
+}
+
 func clusterLocalRegistryDisplay(ctx context.Context) (string, error) {
 	kClient, err := wireK8sClient(ctx)
 	if err != nil {

diff --git a/internal/cli/wire.go b/internal/cli/wire.go
@@ -26,7 +26,6 @@ import (
 	"github.com/tilt-dev/tilt/internal/build"
 	"github.com/tilt-dev/tilt/internal/cloud"
 	"github.com/tilt-dev/tilt/internal/cloud/cloudurl"
-	"github.com/tilt-dev/tilt/internal/container"
 	"github.com/tilt-dev/tilt/internal/controllers"
 	"github.com/tilt-dev/tilt/internal/controllers/core/kubernetesdiscovery"
 	"github.com/tilt-dev/tilt/internal/docker"
@@ -69,7 +68,6 @@ var K8sWireSet = wire.NewSet(
 	k8s.ProvideRESTConfig,
 	k8s.ProvidePortForwardClient,
 	k8s.ProvideConfigNamespace,
-	k8s.ProvideContainerRuntime,
 	k8s.ProvideServerVersion,
 	k8s.ProvideK8sClient,
 	ProvideKubeContextOverride,
@@ -247,14 +245,6 @@ func wireClusterName(ctx context.Context) (k8s.ClusterName, error) {
 	return "", nil
 }
 
-func wireRuntime(ctx context.Context) (container.Runtime, error) {
-	wire.Build(
-		K8sWireSet,
-		k8s.ProvideMinikubeClient,
-	)
-	return "", nil
-}
-
 func wireK8sClient(ctx context.Context) (k8s.Client, error) {
 	wire.Build(
 		K8sWireSet,

diff --git a/internal/cli/wire_gen.go b/internal/cli/wire_gen.go
diff --git a/internal/docker/client_integration_test.go b/internal/docker/client_integration_test.go
@@ -18,7 +18,10 @@ import (
 
 func TestCli_Run(t *testing.T) {
 	ctx, _, _ := testutils.CtxAndAnalyticsForTest()
-	dEnv := ProvideClusterEnv(ctx, RealClientCreator{}, "gke", clusterid.ProductGKE, wmcontainer.RuntimeDocker, k8s.FakeMinikube{})
+	k8sClient := k8s.NewFakeK8sClient(t)
+	k8sClient.Runtime = wmcontainer.RuntimeDocker
+
+	dEnv := ProvideClusterEnv(ctx, RealClientCreator{}, "gke", clusterid.ProductGKE, k8sClient, k8s.FakeMinikube{})
 	cli := NewDockerClient(ctx, Env(dEnv))
 	defer func() {
 		// release any idle connections to avoid out of file errors if running test many times

diff --git a/internal/docker/client_test.go b/internal/docker/client_test.go
@@ -403,7 +403,9 @@ func TestProvideClusterProduct(t *testing.T) {
 
 			mkClient := k8s.FakeMinikube{DockerEnvMap: c.mkEnv, FakeVersion: minikubeV}
 			kubeContext := k8s.KubeContext(fmt.Sprintf("%s-me", c.env))
-			cluster := ProvideClusterEnv(context.Background(), fakeClientCreator{}, kubeContext, c.env, c.runtime, mkClient)
+			kCli := k8s.NewFakeK8sClient(t)
+			kCli.Runtime = c.runtime
+			cluster := ProvideClusterEnv(context.Background(), fakeClientCreator{}, kubeContext, c.env, kCli, mkClient)
 			assert.Equal(t, c.expectedCluster, Env(cluster))
 
 			local := ProvideLocalEnv(context.Background(), fakeClientCreator{}, kubeContext, c.env, cluster)

diff --git a/internal/docker/env.go b/internal/docker/env.go
@@ -186,7 +186,7 @@ func ProvideClusterEnv(
 	creator ClientCreator,
 	kubeContext k8s.KubeContext,
 	product clusterid.Product,
-	runtime container.Runtime,
+	kClient k8s.Client,
 	minikubeClient k8s.MinikubeClient,
 ) ClusterEnv {
 	// start with an empty env, then populate with cluster-specific values if
@@ -219,45 +219,45 @@ func ProvideClusterEnv(
 		}
 	}
 
-	if runtime == container.RuntimeDocker {
-		if product == clusterid.ProductMinikube {
-			// If we're running Minikube with a docker runtime, talk to Minikube's docker socket.
-			envMap, ok, err := minikubeClient.DockerEnv(ctx)
-			if err != nil {
-				return ClusterEnv{Error: err}
-			}
-
-			if ok {
-				d, err := creator.FromEnvMap(envMap)
-				if err != nil {
-					return ClusterEnv{Error: fmt.Errorf("connecting to minikube: %v", err)}
-				}
-
-				// Handle the case where people manually set DOCKER_HOST to minikube.
-				if hostOverride == "" || hostOverride == d.DaemonHost() {
-					env.IsOldMinikube = isOldMinikube(ctx, minikubeClient)
-					env.BuildToKubeContexts = append(env.BuildToKubeContexts, string(kubeContext))
-					env.Client = d
-					for k, v := range envMap {
-						env.Environ = append(env.Environ, fmt.Sprintf("%s=%s", k, v))
-					}
-					sort.Strings(env.Environ)
-				}
+	if product == clusterid.ProductMinikube && kClient.ContainerRuntime(ctx) == container.RuntimeDocker {
+		// If we're running Minikube with a docker runtime, talk to Minikube's docker socket.
+		envMap, ok, err := minikubeClient.DockerEnv(ctx)
+		if err != nil {
+			return ClusterEnv{Error: err}
+		}
 
-			}
-		} else if product == clusterid.ProductMicroK8s {
-			// If we're running Microk8s with a docker runtime, talk to Microk8s's docker socket.
-			d, err := creator.FromEnvMap(map[string]string{"DOCKER_HOST": microK8sDockerHost})
+		if ok {
+			d, err := creator.FromEnvMap(envMap)
 			if err != nil {
-				return ClusterEnv{Error: fmt.Errorf("connecting to microk8s: %v", err)}
+				return ClusterEnv{Error: fmt.Errorf("connecting to minikube: %v", err)}
 			}
 
-			// Handle the case where people manually set DOCKER_HOST to microk8s.
+			// Handle the case where people manually set DOCKER_HOST to minikube.
 			if hostOverride == "" || hostOverride == d.DaemonHost() {
-				env.Client = d
-				env.Environ = append(env.Environ, fmt.Sprintf("DOCKER_HOST=%s", microK8sDockerHost))
+				env.IsOldMinikube = isOldMinikube(ctx, minikubeClient)
 				env.BuildToKubeContexts = append(env.BuildToKubeContexts, string(kubeContext))
+				env.Client = d
+				for k, v := range envMap {
+					env.Environ = append(env.Environ, fmt.Sprintf("%s=%s", k, v))
+				}
+				sort.Strings(env.Environ)
 			}
+
+		}
+	}
+
+	if product == clusterid.ProductMicroK8s && kClient.ContainerRuntime(ctx) == container.RuntimeDocker {
+		// If we're running Microk8s with a docker runtime, talk to Microk8s's docker socket.
+		d, err := creator.FromEnvMap(map[string]string{"DOCKER_HOST": microK8sDockerHost})
+		if err != nil {
+			return ClusterEnv{Error: fmt.Errorf("connecting to microk8s: %v", err)}
+		}
+
+		// Handle the case where people manually set DOCKER_HOST to microk8s.
+		if hostOverride == "" || hostOverride == d.DaemonHost() {
+			env.Client = d
+			env.Environ = append(env.Environ, fmt.Sprintf("DOCKER_HOST=%s", microK8sDockerHost))
+			env.BuildToKubeContexts = append(env.BuildToKubeContexts, string(kubeContext))
 		}
 	}
 
@@ -276,7 +276,8 @@ func ProvideClusterEnv(
 	// currently, we handle this by inspecting the Docker + K8s configs to see
 	// if they're matched up, but with the exception of microk8s (handled above),
 	// we don't override the environmental Docker config
-	if runtime == container.RuntimeDocker && willBuildToKubeContext(ctx, product, kubeContext, env) {
+	if willBuildToKubeContext(ctx, product, kubeContext, env) &&
+		kClient.ContainerRuntime(ctx) == container.RuntimeDocker {
 		env.BuildToKubeContexts = append(env.BuildToKubeContexts, string(kubeContext))
 	}