Skip to content

Commit e94ff85

Browse files
authored
Merge pull request #15665 from wduncanfraser/add-geneve
Added geneve as a kernel module in minikube ISO
2 parents b3a11c6 + 2b74b90 commit e94ff85

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
2323
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
2424

2525
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
26-
ISO_VERSION ?= v1.30.1-1686672019-15164
26+
ISO_VERSION ?= v1.30.1-1686713055-15665
2727

2828
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2929
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ CONFIG_DM_ZERO=m
436436
CONFIG_NETDEVICES=y
437437
CONFIG_MACVLAN=m
438438
CONFIG_MACVTAP=m
439+
CONFIG_GENEVE=m
439440
CONFIG_TUN=y
440441
CONFIG_VETH=m
441442
CONFIG_VIRTIO_NET=y

deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ CONFIG_MACVLAN=y
373373
CONFIG_MACVTAP=y
374374
CONFIG_IPVLAN=m
375375
CONFIG_VXLAN=y
376+
CONFIG_GENEVE=m
376377
CONFIG_NETCONSOLE=y
377378
CONFIG_TUN=y
378379
CONFIG_VETH=y

pkg/minikube/download/iso.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const fileScheme = "file"
4141
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4242
func DefaultISOURLs() []string {
4343
v := version.GetISOVersion()
44-
isoBucket := "minikube-builds/iso/15164"
44+
isoBucket := "minikube-builds/iso/15665"
4545

4646
return []string{
4747
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

0 commit comments

Comments
 (0)