From f2955b90ac73b2fe7f5b2393923617eed391c4b3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Sep 2024 10:40:44 -0700 Subject: [PATCH 1/5] Disallow using Docker Desktop 4.34.0 on macos --- pkg/drivers/kic/oci/oci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 3fcbe63b3251..63cc6cac91b7 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -533,7 +533,7 @@ func withPortMappings(portMappings []PortMapping) createOpt { // ListContainersByLabel returns all the container names with a specified label func ListContainersByLabel(ctx context.Context, ociBin string, label string, warnSlow ...bool) ([]string, error) { - rr, err := runCmd(exec.CommandContext(ctx, ociBin, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}"), warnSlow...) + rr, err := runCmd(exec.Command(ociBin, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}"), warnSlow...) if err != nil { return nil, err } From 7027336e39572a278b51a37a74434befd4c4853e Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Sep 2024 10:41:54 -0700 Subject: [PATCH 2/5] Disallow using Docker Desktop 4.34.0 on macos --- pkg/minikube/registry/drvs/docker/docker.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 9d5b11424618..831aae65916b 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -191,6 +191,7 @@ var dockerVersionOrState = func() (string, registry.State) { } func checkDockerEngineVersion(o string) registry.State { + fmt.Println("**********------------------------------------********", o) parts := strings.SplitN(o, "-", 2) if len(parts) != 2 { return registry.State{ @@ -289,6 +290,17 @@ func checkDockerDesktopVersion(version string) (s registry.State) { Fix: "Update Docker Desktop to 4.16.1 or greater", } } + + if runtime.GOOS == "darwin" && currSemver.EQ(semver.MustParse("4.34.0")) { + return registry.State{ + Reason: "PROVIDER_DOCKER_DESKTOP_VERSION_BAD", + Running: true, + Error: errors.New("Docker Desktop 4.34.0 has a regression that prevents minikube from listing the containers"), + Installed: true, + Fix: "Use a different Docker desktop version, more info at https://github.com/docker/cli/issues/5412", + } + } + return s } From a47f15b0e95dd8ae91c7a5a8e4d390a6d6832658 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Sep 2024 10:42:38 -0700 Subject: [PATCH 3/5] remove unneeded changes --- pkg/drivers/kic/oci/oci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 63cc6cac91b7..3fcbe63b3251 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -533,7 +533,7 @@ func withPortMappings(portMappings []PortMapping) createOpt { // ListContainersByLabel returns all the container names with a specified label func ListContainersByLabel(ctx context.Context, ociBin string, label string, warnSlow ...bool) ([]string, error) { - rr, err := runCmd(exec.Command(ociBin, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}"), warnSlow...) + rr, err := runCmd(exec.CommandContext(ctx, ociBin, "ps", "-a", "--filter", fmt.Sprintf("label=%s", label), "--format", "{{.Names}}"), warnSlow...) if err != nil { return nil, err } From fdb26cf122c2332ba18ce094f04d3d90c018eedb Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Sep 2024 10:43:05 -0700 Subject: [PATCH 4/5] remove unneeded changes --- pkg/minikube/registry/drvs/docker/docker.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 831aae65916b..89f5da5617fa 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -191,7 +191,6 @@ var dockerVersionOrState = func() (string, registry.State) { } func checkDockerEngineVersion(o string) registry.State { - fmt.Println("**********------------------------------------********", o) parts := strings.SplitN(o, "-", 2) if len(parts) != 2 { return registry.State{ From 2e9b50ac88536491e648f1503809a6b59d99d481 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Sep 2024 10:59:04 -0700 Subject: [PATCH 5/5] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3cbd85b57a..170cdac66b7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Breaking Changes: * Bump minimum podman version to 4.9.0 [#19457](https://github.com/kubernetes/minikube/pull/19457) - +* Disallow using Docker Desktop 4.34.0 Features: * Bump default Kubernetes version to v1.31.0 [#19435](https://github.com/kubernetes/minikube/pull/19435) * Add new driver for macOS: vfkit [#19423](https://github.com/kubernetes/minikube/pull/19423)