Skip to content

Commit d77aaf4

Browse files
committed
Makefile: remove drivers and hyperkit related images
1 parent 23eccbf commit d77aaf4

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

Makefile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
5454
COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
5555
COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true)
5656
COMMIT_NOQUOTES := $(patsubst "%",%,$(COMMIT))
57-
# source code for image: https://github.com/neilotoole/xcgo
58-
HYPERKIT_BUILD_IMAGE ?= quay.io/nirsof/xcgo:jammy-v2
5957

6058
# NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes
6159
# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION
@@ -133,7 +131,6 @@ MINIKUBE_LDFLAGS := -X k8s.io/minikube/pkg/version.version=$(VERSION) -X k8s.io/
133131
PROVISIONER_LDFLAGS := "-X k8s.io/minikube/pkg/storage.version=$(STORAGE_PROVISIONER_TAG) -s -w -extldflags '-static'"
134132

135133
MINIKUBEFILES := ./cmd/minikube/
136-
HYPERKIT_FILES := ./cmd/drivers/hyperkit
137134
STORAGE_PROVISIONER_FILES := ./cmd/storage-provisioner
138135
KVM_DRIVER_FILES := ./cmd/drivers/kvm/
139136

@@ -162,9 +159,6 @@ ADDON_FILES = $(shell find "deploy/addons" -type f | grep -v "\.go")
162159
TRANSLATION_FILES = $(shell find "translations" -type f | grep -v "\.go")
163160
ASSET_FILES = $(ADDON_FILES) $(TRANSLATION_FILES)
164161

165-
# hyperkit ldflags
166-
HYPERKIT_LDFLAGS := -X k8s.io/minikube/pkg/drivers/hyperkit.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/hyperkit.gitCommitID=$(COMMIT)
167-
168162
# autopush artefacts
169163
AUTOPUSH ?=
170164

@@ -357,14 +351,7 @@ test-pkg/%: ## Trigger packaging test
357351
go test -v -test.timeout=60m ./$* --tags="$(MINIKUBE_BUILD_TAGS)"
358352

359353
.PHONY: all
360-
all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build all different minikube components
361-
362-
# After https://github.com/kubernetes/minikube/issues/19959 is fixed kvm2-arm64 can be added back
363-
.PHONY: drivers
364-
drivers: docker-machine-driver-hyperkit ## Build external drivers
365-
366-
.PHONY: docker-machine-driver-hyperkit
367-
docker-machine-driver-hyperkit: out/docker-machine-driver-hyperkit ## Build Hyperkit driver
354+
all: cross e2e-cross cross-tars exotic retro out/gvisor-addon ## Build all different minikube components
368355

369356
.PHONY: integration
370357
integration: out/minikube$(IS_EXE) ## Trigger minikube integration test, logs to ./out/testout_COMMIT.txt

0 commit comments

Comments
 (0)