dockerdesktop: reset cluster on create, not delete (#236)

* dockerdesktop: reset cluster on create, not delete

Fixes #232.

* dockerdesktop: pass d4mClient through to admin instance

pkg/cluster/admin_docker_desktop.go

@@ -14,12 +14,13 @@ import (
 // This is a bit different than the other admins, due to the overlap
 //
 type dockerDesktopAdmin struct {
-	os   string
-	host string
+	os     string
+	host   string
+	client d4mClient
 }
 
-func newDockerDesktopAdmin(host string, os string) *dockerDesktopAdmin {
-	return &dockerDesktopAdmin{os: os, host: host}
+func newDockerDesktopAdmin(host string, os string, d4m d4mClient) *dockerDesktopAdmin {
+	return &dockerDesktopAdmin{os: os, host: host, client: d4m}
 }
 
 func (a *dockerDesktopAdmin) EnsureInstalled(ctx context.Context) error { return nil }
@@ -34,6 +35,11 @@ func (a *dockerDesktopAdmin) Create(ctx context.Context, desired *api.Cluster, r
 			a.host)
 	}
 
+	err := a.client.ResetCluster(ctx)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -47,28 +53,18 @@ func (a *dockerDesktopAdmin) Delete(ctx context.Context, config *api.Cluster) er
 		return fmt.Errorf("docker-desktop cannot be deleted from DOCKER_HOST: %s", a.host)
 	}
 
-	client, err := NewDockerDesktopClient()
-	if err != nil {
-		return err
-	}
-
-	err = client.ResetCluster(ctx)
-	if err != nil {
-		return err
-	}
-
-	settings, err := client.settings(ctx)
+	settings, err := a.client.settings(ctx)
 	if err != nil {
 		return err
 	}
 
-	changed, err := client.setK8sEnabled(settings, false)
+	changed, err := a.client.setK8sEnabled(settings, false)
 	if err != nil {
 		return err
 	}
 	if !changed {
 		return nil
 	}
 
-	return client.writeSettings(ctx, settings)
+	return a.client.writeSettings(ctx, settings)
 }

pkg/cluster/cluster.go

@@ -253,7 +253,7 @@ func (c *Controller) admin(ctx context.Context, product clusterid.Product) (Admi
 				dockerClient.DaemonHost())
 		}
 
-		admin = newDockerDesktopAdmin(dockerClient.DaemonHost(), c.os)
+		admin = newDockerDesktopAdmin(dockerClient.DaemonHost(), c.os, c.dmachine.d4m)
 	case clusterid.ProductKIND:
 		admin = newKindAdmin(c.iostreams, dockerClient)
 	case clusterid.ProductK3D:

pkg/cluster/cluster_test.go

@@ -230,6 +230,7 @@ func TestClusterApplyDockerDesktopNoRestart(t *testing.T) {
 	assert.NoError(t, err)
 	f.apply(clusterid.ProductDockerDesktop, 0)
 	assert.Equal(t, 1, f.d4m.settingsWriteCount)
+	assert.Equal(t, 1, f.d4m.resetCount)
 	f.apply(clusterid.ProductDockerDesktop, 0)
 	assert.Equal(t, 1, f.d4m.settingsWriteCount)
 }