Skip to content

Commit 2b52e11

Browse files
authored
remove arm64 kvm (#19985)
* remove arm64 kvm * add to drivers * spaces * spaces * remove kvm arm64 from build and upload script * add missing backslash * remove deb arm64 kvm * add not used * remove kvm arm64
1 parent 9529030 commit 2b52e11

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

Makefile

+20-18
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,12 @@ test-pkg/%: ## Trigger packaging test
356356
.PHONY: all
357357
all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build all different minikube components
358358

359+
# After https://github.com/kubernetes/minikube/issues/19959 is fixed kvm2-arm64 can be added back
359360
.PHONY: drivers
360361
drivers: ## Build Hyperkit and KVM2 drivers
361362
drivers: docker-machine-driver-hyperkit \
362363
docker-machine-driver-kvm2 \
363364
out/docker-machine-driver-kvm2-amd64 \
364-
out/docker-machine-driver-kvm2-arm64
365365

366366

367367
.PHONY: docker-machine-driver-hyperkit
@@ -557,7 +557,7 @@ debs: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \
557557
out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb \
558558
out/docker-machine-driver-kvm2_$(DEB_VERSION).deb \
559559
out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_amd64.deb \
560-
out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb
560+
# out/docker-machine-driver-kvm2_$(DEB_VERSION)-$(DEB_REVISION)_arm64.deb
561561

562562
.PHONY: deb_version
563563
deb_version:
@@ -842,6 +842,7 @@ out/docker-machine-driver-kvm2-x86_64: out/docker-machine-driver-kvm2-amd64
842842
$(if $(quiet),@echo " CP $@")
843843
$(Q)cp $< $@
844844

845+
# https://github.com/kubernetes/minikube/issues/19959
845846
out/docker-machine-driver-kvm2-aarch64: out/docker-machine-driver-kvm2-arm64
846847
$(if $(quiet),@echo " CP $@")
847848
$(Q)cp $< $@
@@ -899,24 +900,25 @@ kvm_in_docker:
899900
install-kvm-driver: out/docker-machine-driver-kvm2 ## Install KVM Driver
900901
mkdir -p $(GOBIN)
901902
cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2
902-
903+
903904

904905
out/docker-machine-driver-kvm2-arm64:
905-
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
906-
docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64
907-
$(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT))
908-
else
909-
$(if $(quiet),@echo " GO $@")
910-
$(Q)GOARCH=arm64 \
911-
go build \
912-
-buildvcs=false \
913-
-installsuffix "static" \
914-
-ldflags="$(KVM2_LDFLAGS)" \
915-
-tags "libvirt_without_lxc" \
916-
-o $@ \
917-
k8s.io/minikube/cmd/drivers/kvm
918-
endif
919-
chmod +X $@
906+
echo "not used till https://github.com/kubernetes/minikube/issues/19959"
907+
# ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
908+
# docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_ARM64) || $(MAKE) kvm-image-arm64
909+
# $(call DOCKER,$(KVM_BUILD_IMAGE_ARM64),/usr/bin/make $@ COMMIT=$(COMMIT))
910+
# else
911+
# $(if $(quiet),@echo " GO $@")
912+
# $(Q)GOARCH=arm64 \
913+
# go build \
914+
# -buildvcs=false \
915+
# -installsuffix "static" \
916+
# -ldflags="$(KVM2_LDFLAGS)" \
917+
# -tags "libvirt_without_lxc" \
918+
# -o $@ \
919+
# k8s.io/minikube/cmd/drivers/kvm
920+
# endif
921+
# chmod +X $@
920922

921923
out/docker-machine-driver-kvm2-%:
922924
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)

hack/jenkins/minikube_cross_build_and_upload.sh

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ make -j 16 \
4949
out/minikube_${DEB_VER}_arm64.deb \
5050
out/docker-machine-driver-kvm2_$(make deb_version_base).deb \
5151
out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \
52-
out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \
5352
&& failed=$? || failed=$?
5453

5554
BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version)

hack/jenkins/release_build_and_upload.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ env BUILD_IN_DOCKER=y \
6161
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_armhf.deb" \
6262
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_ppc64el.deb" \
6363
"out/minikube_${DEB_VERSION}-${DEB_REVISION}_s390x.deb" \
64-
"out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_amd64.deb" \
65-
"out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_arm64.deb"
64+
"out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_amd64.deb"
65+
# "out/docker-machine-driver-kvm2_${DEB_VERSION}-${DEB_REVISION}_arm64.deb"
6666

67-
env BUILD_IN_DOCKER=y
67+
env BUILD_IN_DOCKER=y \
6868
make \
6969
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.x86_64.rpm" \
7070
"out/minikube-${RPM_VERSION}-${RPM_REVISION}.aarch64.rpm" \

pkg/minikube/registry/drvs/kvm2/kvm2.go

+13
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"os/exec"
2626
"os/user"
2727
"path/filepath"
28+
"runtime"
2829
"strings"
2930
"time"
3031

@@ -165,6 +166,18 @@ func status() registry.State {
165166
Doc: docURL,
166167
}
167168
}
169+
170+
if runtime.GOARCH == "arm64" {
171+
return registry.State{
172+
Installed: true,
173+
Running: true,
174+
Error: fmt.Errorf("KVM is not supported on arm64 due to a gcc build error, contributions are welcome"),
175+
Fix: "follow the github issue for possible fix",
176+
Doc: "https://github.com/kubernetes/minikube/issues/19959",
177+
}
178+
179+
}
180+
168181
if err != nil {
169182
return registry.State{
170183
Installed: true,

0 commit comments

Comments
 (0)