From c2d435945638631faa3f4d200f2895d4852125ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sat, 7 Nov 2020 12:52:43 +0100
Subject: [PATCH 1/5] Upgrade cri-o in kicbase to version 1.18.4
Use the latest 1.18, since 1.18.4 is broken again <sigh>
Use the recommended cri-o-runc package instead of runc
---
deploy/kicbase/Dockerfile | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
index 13bd51a0e0..66e6fd7bbe 100644
--- a/deploy/kicbase/Dockerfile
+++ b/deploy/kicbase/Dockerfile
@@ -107,16 +107,16 @@ RUN sh -c "echo 'deb https://download.docker.com/linux/ubuntu focal stable' > /e
clean-install docker-ce docker-ce-cli containerd.io
# Install cri-o/podman dependencies:
-RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
+RUN sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_20.04/Release.key && \
apt-key add - < Release.key && \
clean-install containers-common catatonit conmon containernetworking-plugins cri-tools podman-plugins varlink
-# install cri-o based on https://github.com/cri-o/cri-o/commit/96b0c34b31a9fc181e46d7d8e34fb8ee6c4dc4e1#diff-04c6e90faac2675aa89e2176d2eec7d8R128
-RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
- curl -LO https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/Release.key && \
+# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.18/README.md#installing-cri-o
+RUN sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:1.18.list" && \
+ curl -LO https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18/xUbuntu_20.04/Release.key && \
apt-key add - < Release.key && \
- clean-install cri-o=1.18.3~3
+ clean-install cri-o cri-o-runc
# install podman
RUN sh -c "echo 'deb https://dl.bintray.com/afbjorklund/podman focal main' > /etc/apt/sources.list.d/podman.list" && \
@@ -124,8 +124,6 @@ RUN sh -c "echo 'deb https://dl.bintray.com/afbjorklund/podman focal main' > /et
apt-key add - < afbjorklund-public.key.asc && \
clean-install podman=1.9.3~1
-RUN mkdir -p /usr/lib/cri-o-runc/sbin && cp /usr/bin/runc /usr/lib/cri-o-runc/sbin/runc
-
# automount service
COPY automount/minikube-automount /usr/sbin/minikube-automount
COPY automount/minikube-automount.service /usr/lib/systemd/system/minikube-automount.service
From 1a9a54e45847b00b81e57c7005b5887c8ea68673 Mon Sep 17 00:00:00 2001
From: Predrag Rogic <prezha@users.noreply.github.com>
Date: Sat, 7 Nov 2020 23:07:35 +0000
Subject: [PATCH 2/5] Update generate-docs test to include --help flag
---
cmd/minikube/cmd/generate-docs_test.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index 3a4e8b6ba6..88c261940a 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -23,10 +23,12 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
+ "github.com/spf13/pflag"
"k8s.io/minikube/pkg/generate"
)
func TestGenerateDocs(t *testing.T) {
+ pflag.BoolP("help", "h", false, "")
dir := "../../../site/content/en/docs/commands/"
for _, sc := range RootCmd.Commands() {
From 432762f9e3b2105a818e6a51eb62983b4de5dcce Mon Sep 17 00:00:00 2001
From: Predrag Rogic <prezha@users.noreply.github.com>
Date: Sat, 7 Nov 2020 23:40:41 +0000
Subject: [PATCH 3/5] Update generate-docs test to include --help flag
---
cmd/minikube/cmd/generate-docs_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/minikube/cmd/generate-docs_test.go b/cmd/minikube/cmd/generate-docs_test.go
index 88c261940a..b8dab4e720 100644
--- a/cmd/minikube/cmd/generate-docs_test.go
+++ b/cmd/minikube/cmd/generate-docs_test.go
@@ -28,7 +28,7 @@ import (
)
func TestGenerateDocs(t *testing.T) {
- pflag.BoolP("help", "h", false, "")
+ pflag.BoolP("help", "h", false, "") // avoid 'Docs are not updated. Please run `make generate-docs` to update commands documentation' error
dir := "../../../site/content/en/docs/commands/"
for _, sc := range RootCmd.Commands() {
From 878ff021011cc54c4bbb5dbe0eda5eea7ac73941 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Fri, 6 Nov 2020 18:59:39 -0800
Subject: [PATCH 4/5] bump iso on head
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index eac47a70c2..18be26a02e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.14.0
+ISO_VERSION ?= v1.15.0-snapshot1
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
RPM_VERSION ?= $(DEB_VERSION)
From 28044cddb5b825dc6c4e07ed62c91708294461e9 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Sun, 8 Nov 2020 17:12:33 -0800
Subject: [PATCH 5/5] update docs
---
site/content/en/docs/commands/start.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index a23717f0b5..20ba4967ac 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -64,7 +64,7 @@ minikube start [flags]
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
--install-addons If set, install addons. Defaults to true. (default true)
--interactive Allow user prompts for more information (default true)
- --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.14.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.14.0/minikube-v1.14.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.14.0.iso])
+ --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.15.0-snapshot1.iso,https://github.com/kubernetes/minikube/releases/download/v1.15.0-snapshot1/minikube-v1.15.0-snapshot1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.15.0-snapshot1.iso])
--keep-context This will keep the existing kubectl context and will create a minikube context.
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.19.2, 'latest' for v1.19.2). Defaults to 'stable'.
--kvm-gpu Enable experimental NVIDIA GPU support in minikube