From 00bf0492f122e22eb3a02a481005c790783436d0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 10 Jan 2023 22:54:37 -0800 Subject: [PATCH 1/7] update kvm docker machine base image --- Makefile | 7 +++---- installers/linux/kvm/Dockerfile.amd64 | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7a90b8b9e29f..57e90590b9e1 100644 --- a/Makefile +++ b/Makefile @@ -901,7 +901,7 @@ else -buildvcs=false \ -installsuffix "static" \ -ldflags="$(KVM2_LDFLAGS)" \ - -tags "libvirt.1.3.1 without_lxc" \ + -tags "libvirt_without_lxc" \ -o $@ \ k8s.io/minikube/cmd/drivers/kvm endif @@ -911,15 +911,14 @@ out/docker-machine-driver-kvm2-%: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_AMD64) || $(MAKE) kvm-image-amd64 $(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT)) - # make extra sure that we are linking with the older version of libvirt (1.3.1) - test "`strings $@ | grep '^LIBVIRT_[0-9]' | sort | tail -n 1`" = "LIBVIRT_1.2.9" else $(if $(quiet),@echo " GO $@") $(Q)GOARCH=$* \ go build \ + -buildvcs=false \ -installsuffix "static" \ -ldflags="$(KVM2_LDFLAGS)" \ - -tags "libvirt.1.3.1 without_lxc" \ + -tags "libvirt_without_lxc" \ -o $@ \ k8s.io/minikube/cmd/drivers/kvm endif diff --git a/installers/linux/kvm/Dockerfile.amd64 b/installers/linux/kvm/Dockerfile.amd64 index 41814301b750..2c9e8ff7e5a0 100644 --- a/installers/linux/kvm/Dockerfile.amd64 +++ b/installers/linux/kvm/Dockerfile.amd64 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/gcp-runtimes/ubuntu_16_0_4 +FROM gcr.io/gcp-runtimes/ubuntu_20_0_4 RUN apt-get update && apt-get install -y --no-install-recommends \ gcc \ From c4503c24e8ba3b5811ca725e254d398594a3f604 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 08:20:00 -0800 Subject: [PATCH 2/7] add debugging --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 57e90590b9e1..4a6b8b48c33e 100644 --- a/Makefile +++ b/Makefile @@ -911,8 +911,10 @@ out/docker-machine-driver-kvm2-%: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_AMD64) || $(MAKE) kvm-image-amd64 $(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT)) + strings $@ | grep ^LIBVIRT | sort else $(if $(quiet),@echo " GO $@") + uname -a $(Q)GOARCH=$* \ go build \ -buildvcs=false \ From 1ac1e8673a76b9ece11459b5a38bab44c5851de1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 09:44:08 -0800 Subject: [PATCH 3/7] more debugging --- .github/workflows/functional_verified.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index acabc83201a1..dfbc92c2c3c4 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -47,7 +47,9 @@ jobs: sudo apt-get update sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs + strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort cp -r test/integration/testdata ./out + strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: minikube_binaries From a7554d3a3ad919a418a72e706690ead6e2cd129a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 10:24:36 -0800 Subject: [PATCH 4/7] even more debugging --- .github/workflows/functional_verified.yml | 6 ++++++ Makefile | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index dfbc92c2c3c4..67fbb401beb8 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,10 +46,16 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libvirt-dev + ls -la ./out MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort + shasum -a 256 out/docker-machine-driver-kvm2-amd64 + ls -la ./out cp -r test/integration/testdata ./out strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort + shasum -a 256 out/docker-machine-driver-kvm2-amd64 + ls -la ./out + shasum -a 256 out/minikube-linux-amd64 - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: minikube_binaries diff --git a/Makefile b/Makefile index 4a6b8b48c33e..23e733e70382 100644 --- a/Makefile +++ b/Makefile @@ -912,6 +912,7 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_AMD64) || $(MAKE) kvm-image-amd64 $(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT)) strings $@ | grep ^LIBVIRT | sort + shasum -a 256 $@ else $(if $(quiet),@echo " GO $@") uname -a From f1090b9bbcf54e97be3ba2922c05639adaec925f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 10:31:41 -0800 Subject: [PATCH 5/7] remove ls on non-existing folder --- .github/workflows/functional_verified.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 67fbb401beb8..deefcd8d48c8 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -46,7 +46,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libvirt-dev - ls -la ./out MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort shasum -a 256 out/docker-machine-driver-kvm2-amd64 From bf77c2a567024bb466389f861194f51745ebe63d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 14:34:42 -0800 Subject: [PATCH 6/7] remove debugging and add docker cleanup --- .github/workflows/functional_verified.yml | 7 ------- Makefile | 2 -- hack/jenkins/minikube_cross_build_and_upload.sh | 1 + 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index deefcd8d48c8..acabc83201a1 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -47,14 +47,7 @@ jobs: sudo apt-get update sudo apt-get install -y libvirt-dev MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs - strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort - shasum -a 256 out/docker-machine-driver-kvm2-amd64 - ls -la ./out cp -r test/integration/testdata ./out - strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort - shasum -a 256 out/docker-machine-driver-kvm2-amd64 - ls -la ./out - shasum -a 256 out/minikube-linux-amd64 - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: minikube_binaries diff --git a/Makefile b/Makefile index 23e733e70382..e2e033abc251 100644 --- a/Makefile +++ b/Makefile @@ -911,8 +911,6 @@ out/docker-machine-driver-kvm2-%: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_AMD64) || $(MAKE) kvm-image-amd64 $(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT)) - strings $@ | grep ^LIBVIRT | sort - shasum -a 256 $@ else $(if $(quiet),@echo " GO $@") uname -a diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 5f9a4effbef7..1c540fafaaa8 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -39,6 +39,7 @@ declare -rx DEB_VER="$(make deb_version)" docker kill $(docker ps -q) || true docker rm $(docker ps -aq) || true +docker system prune -a --volumes -f make -j 16 \ all \ minikube-darwin-arm64 \ From d74813657905458cf2bed11a3b6edc374d7011c7 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 11 Jan 2023 14:40:54 -0800 Subject: [PATCH 7/7] remove last debugging code --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index e2e033abc251..57e90590b9e1 100644 --- a/Makefile +++ b/Makefile @@ -913,7 +913,6 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT)) else $(if $(quiet),@echo " GO $@") - uname -a $(Q)GOARCH=$* \ go build \ -buildvcs=false \