From 0ed9febbfbba4b31de7b1b7570f9bf3f1882c5e8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 6 Apr 2023 13:37:50 -0700 Subject: [PATCH 1/5] Kicbase: Resolve docker build deprecation --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index f92ac6e970ff..1aadfeb66807 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -148,7 +148,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/armhf/arm-v7/') && \ sh -c "echo 'deb https://download.docker.com/linux/ubuntu ${DIST} stable' > /etc/apt/sources.list.d/docker.list" && \ curl -L https://download.docker.com/linux/ubuntu/gpg -o docker.key && \ apt-key add - < docker.key && \ - clean-install docker-ce docker-ce-cli containerd.io + clean-install docker-ce docker-ce-cli containerd.io docker-buildx-plugin # install buildkit RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \ From e79fe8566206c3b7e761c5ea7c69fb7095671728 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 6 Apr 2023 21:00:11 +0000 Subject: [PATCH 2/5] Updating kicbase image to v0.0.39-1680813808-16252 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index cf49594d96ff..931f2687484d 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.39" + Version = "v0.0.39-1680813808-16252" // SHA of the kic base image - baseImageSHA = "bf2d9f1e9d837d8deea073611d2605405b6be904647d97ebd9b12045ddfe1106" + baseImageSHA = "4d62d233cf4143189be209981d7b5b8b7fbf20ac03586d159c4c05276e84e45f" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 3b59f96c1890..e3c538de348f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.39@sha256:bf2d9f1e9d837d8deea073611d2605405b6be904647d97ebd9b12045ddfe1106") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.39-1680813808-16252@sha256:4d62d233cf4143189be209981d7b5b8b7fbf20ac03586d159c4c05276e84e45f") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 41be18992e6740bb2f3e7afd9fe9255fa34b2d7b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 7 Apr 2023 12:26:13 -0700 Subject: [PATCH 3/5] fix TestImageBuild/serial/BuildWithBuildArg --- test/integration/image_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/image_test.go b/test/integration/image_test.go index 4552b36010f0..4e6369640b0a 100644 --- a/test/integration/image_test.go +++ b/test/integration/image_test.go @@ -95,7 +95,7 @@ func validateImageBuildWithBuildArg(ctx context.Context, t *testing.T, profile s if err != nil { t.Fatalf("failed to build image with args: %q : %v", rr.Command(), err) } - output := rr.Stdout.String() + output := rr.Stderr.String() if !strings.Contains(output, "test_env_str") { t.Fatalf("failed to pass build-args with args: %q : %s", rr.Command(), output) } From c0c35b8217bd76e098d57a7d0234386eb3028c83 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 10 Apr 2023 09:40:12 -0700 Subject: [PATCH 4/5] fix TestImageBuild/serial/BuildWithBuildArg for VM --- test/integration/image_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration/image_test.go b/test/integration/image_test.go index 4e6369640b0a..fe7a57b5219d 100644 --- a/test/integration/image_test.go +++ b/test/integration/image_test.go @@ -95,7 +95,11 @@ func validateImageBuildWithBuildArg(ctx context.Context, t *testing.T, profile s if err != nil { t.Fatalf("failed to build image with args: %q : %v", rr.Command(), err) } - output := rr.Stderr.String() + output := rr.Stdout.String() + // kicbase Docker uses buildx plugin which outputs build logs to stderr + if KicDriver() { + output = rr.Stderr.String() + } if !strings.Contains(output, "test_env_str") { t.Fatalf("failed to pass build-args with args: %q : %s", rr.Command(), output) } From d1465d9af763fc827b219b7df26e8429867e1c29 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 11 Apr 2023 10:42:07 -0700 Subject: [PATCH 5/5] fix TestImageBuild/serial/BuildWithBuildArg --- test/integration/image_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/integration/image_test.go b/test/integration/image_test.go index fe7a57b5219d..af910bf9ec57 100644 --- a/test/integration/image_test.go +++ b/test/integration/image_test.go @@ -95,11 +95,7 @@ func validateImageBuildWithBuildArg(ctx context.Context, t *testing.T, profile s if err != nil { t.Fatalf("failed to build image with args: %q : %v", rr.Command(), err) } - output := rr.Stdout.String() - // kicbase Docker uses buildx plugin which outputs build logs to stderr - if KicDriver() { - output = rr.Stderr.String() - } + output := rr.Output() if !strings.Contains(output, "test_env_str") { t.Fatalf("failed to pass build-args with args: %q : %s", rr.Command(), output) }