Skip to content

Commit 6703066

Browse files
authored
Merge pull request #13814 from afbjorklund/buildroot-2021.02.10
ISO: Upgrade buildroot minor version
2 parents 4dd50b4 + d55f81a commit 6703066

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
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.25.2-1649577058-13659
26+
ISO_VERSION ?= v1.25.2-1650391217-13814
2727
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2828
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
2929
DEB_REVISION ?= 0
@@ -42,7 +42,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
4242

4343

4444
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
45-
BUILDROOT_BRANCH ?= 2021.02.4
45+
BUILDROOT_BRANCH ?= 2021.02.12
4646
# the go version on the line below is for the ISO and does not need to be updated often
4747
GOLANG_OPTIONS = GO_VERSION=1.17 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
4848
BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
@@ -73,7 +73,7 @@ MINIKUBE_BUCKET ?= minikube/releases
7373
MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
7474
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
7575

76-
KERNEL_VERSION ?= 4.19.202
76+
KERNEL_VERSION ?= 4.19.235
7777
# latest from https://github.com/golangci/golangci-lint/releases
7878
# update this only by running `make update-golint-version`
7979
GOLINT_VERSION ?= v1.45.2

deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/ssh/sshd_config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,8 @@ Subsystem sftp /usr/libexec/sftp-server
117117
# AllowTcpForwarding no
118118
# PermitTTY no
119119
# ForceCommand cvs server
120+
121+
# Temporarily accept ssh-rsa algorithm for openssh >= 8.8,
122+
# until most ssh clients could deprecate ssh-rsa.
123+
HostkeyAlgorithms +ssh-rsa
124+
PubkeyAcceptedAlgorithms +ssh-rsa

deploy/iso/minikube-iso/configs/minikube_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
3131
# Kernel
3232
BR2_LINUX_KERNEL=y
3333
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
34-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
34+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.235"
3535
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
3636
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
3737

pkg/minikube/download/iso.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const fileScheme = "file"
4040
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4141
func DefaultISOURLs() []string {
4242
v := version.GetISOVersion()
43-
isoBucket := "minikube-builds/iso/13659"
43+
isoBucket := "minikube-builds/iso/13814"
4444
return []string{
4545
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
4646
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),

site/content/en/docs/commands/start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ minikube start [flags]
6969
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
7070
--install-addons If set, install addons. Defaults to true. (default true)
7171
--interactive Allow user prompts for more information (default true)
72-
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13659/minikube-v1.25.2-1649577058-13659.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1649577058-13659/minikube-v1.25.2-1649577058-13659.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1649577058-13659.iso])
72+
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13814/minikube-v1.25.2-1650391217-13814.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1650391217-13814/minikube-v1.25.2-1650391217-13814.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1650391217-13814.iso])
7373
--keep-context This will keep the existing kubectl context and will create a minikube context.
7474
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'.
7575
--kvm-gpu Enable experimental NVIDIA GPU support in minikube

0 commit comments

Comments
 (0)