From b5cd6c45497d9b35ebf55d81a771cb9f409920a5 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 17 Mar 2022 14:55:11 -0700 Subject: [PATCH 01/17] containerd: use drop in config to update values --- .../containerd-bin-aarch64/config.toml | 143 ++++++------------ .../package/containerd-bin/containerd-bin.mk | 1 + deploy/kicbase/Dockerfile | 1 + deploy/kicbase/containerd.toml | 76 ++++++++++ pkg/minikube/cruntime/containerd.go | 94 +++--------- 5 files changed, 140 insertions(+), 175 deletions(-) create mode 100644 deploy/kicbase/containerd.toml diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml index f588941a5e..25555749c7 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml @@ -1,26 +1,16 @@ version = 2 root = "/var/lib/containerd" state = "/run/containerd" -plugin_dir = "" -disabled_plugins = [] -required_plugins = [] oom_score = 0 +imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"] [grpc] address = "/run/containerd/containerd.sock" - tcp_address = "" - tcp_tls_cert = "" - tcp_tls_key = "" uid = 0 gid = 0 max_recv_message_size = 16777216 max_send_message_size = 16777216 -[ttrpc] - address = "" - uid = 0 - gid = 0 - [debug] address = "" uid = 0 @@ -34,100 +24,53 @@ oom_score = 0 [cgroup] path = "" -[timeouts] - "io.containerd.timeout.shim.cleanup" = "5s" - "io.containerd.timeout.shim.load" = "5s" - "io.containerd.timeout.shim.shutdown" = "3s" - "io.containerd.timeout.task.state" = "2s" +[proxy_plugins] +# fuse-overlayfs is used for rootless +[proxy_plugins."fuse-overlayfs"] + type = "snapshot" + address = "/run/containerd-fuse-overlayfs.sock" [plugins] + [plugins."io.containerd.monitor.v1.cgroups"] + no_prometheus = false + [plugins."io.containerd.grpc.v1.cri"] + stream_server_address = "" + stream_server_port = "10010" + enable_selinux = false + sandbox_image = "k8s.gcr.io/pause:3.6" + stats_collect_period = 10 + enable_tls_streaming = false + max_container_log_line_size = 16384 + restrict_oom_score_adj = false + + [plugins."io.containerd.grpc.v1.cri".containerd] + discard_unpacked_layers = true + snapshotter = "overlayfs" + [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] + runtime_type = "" + runtime_engine = "" + runtime_root = "" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = false + + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/opt/cni/bin" + conf_dir = "/etc/cni/net.mk" + conf_template = "" + [plugins."io.containerd.grpc.v1.cri".registry] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + endpoint = ["https://registry-1.docker.io"] + [plugins."io.containerd.service.v1.diff-service"] + default = ["walking"] [plugins."io.containerd.gc.v1.scheduler"] pause_threshold = 0.02 deletion_threshold = 0 mutation_threshold = 100 schedule_delay = "0s" startup_delay = "100ms" - [plugins."io.containerd.grpc.v1.cri"] - disable_tcp_service = true - stream_server_address = "" - stream_server_port = "10010" - stream_idle_timeout = "4h0m0s" - enable_selinux = false - selinux_category_range = 1024 - sandbox_image = "k8s.gcr.io/pause:3.2" - stats_collect_period = 10 - systemd_cgroup = true - enable_tls_streaming = false - max_container_log_line_size = 16384 - disable_cgroup = false - disable_apparmor = false - restrict_oom_score_adj = false - max_concurrent_downloads = 3 - disable_proc_mount = false - unset_seccomp_profile = "" - tolerate_missing_hugetlb_controller = true - disable_hugetlb_controller = true - ignore_image_defined_volumes = false - [plugins."io.containerd.grpc.v1.cri".containerd] - snapshotter = "overlayfs" - default_runtime_name = "runc" - no_pivot = false - disable_snapshot_annotations = true - discard_unpacked_layers = false - [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] - runtime_type = "" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] - runtime_type = "" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/opt/cni/bin" - conf_dir = "/etc/cni/net.d" - max_conf_num = 1 - conf_template = "" - [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] - [plugins."io.containerd.grpc.v1.cri".image_decryption] - key_model = "" - [plugins."io.containerd.grpc.v1.cri".x509_key_pair_streaming] - tls_cert_file = "" - tls_key_file = "" - [plugins."io.containerd.internal.v1.opt"] - path = "/opt/containerd" - [plugins."io.containerd.internal.v1.restart"] - interval = "10s" - [plugins."io.containerd.metadata.v1.bolt"] - content_sharing_policy = "shared" - [plugins."io.containerd.monitor.v1.cgroups"] - no_prometheus = false - [plugins."io.containerd.runtime.v1.linux"] - shim = "containerd-shim" - runtime = "runc" - runtime_root = "" - no_shim = false - shim_debug = false - [plugins."io.containerd.runtime.v2.task"] - platforms = ["linux/amd64"] - [plugins."io.containerd.service.v1.diff-service"] - default = ["walking"] - [plugins."io.containerd.snapshotter.v1.devmapper"] - root_path = "" - pool_name = "" - base_image_size = "" - async_remove = false diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 509a9ad761..0d729d6c9c 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -27,6 +27,7 @@ endef define CONTAINERD_BIN_CONFIGURE_CMDS mkdir -p $(CONTAINERD_BIN_GOPATH)/src/github.com/containerd + mkdir -p $(TARGET_DIR)/etc/containerd/containerd.conf.d ln -sf $(@D) $(CONTAINERD_BIN_COMPILE_SRC) endef diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 549f48c985..2d1c4ca9dd 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -44,6 +44,7 @@ ARG CRIO_VERSION="1.22" COPY deploy/kicbase/10-network-security.conf /etc/sysctl.d/10-network-security.conf COPY deploy/kicbase/11-tcp-mtu-probing.conf /etc/sysctl.d/11-tcp-mtu-probing.conf COPY deploy/kicbase/02-crio.conf /etc/crio/crio.conf.d/02-crio.conf +COPY deploy/kicbase/containerd.toml /etc/containerd/containerd.toml COPY deploy/kicbase/clean-install /usr/local/bin/clean-install COPY deploy/kicbase/entrypoint /usr/local/bin/entrypoint COPY --from=0 /src/cmd/auto-pause/auto-pause /bin/auto-pause diff --git a/deploy/kicbase/containerd.toml b/deploy/kicbase/containerd.toml new file mode 100644 index 0000000000..07367dfd21 --- /dev/null +++ b/deploy/kicbase/containerd.toml @@ -0,0 +1,76 @@ +version = 2 +root = "/var/lib/containerd" +state = "/run/containerd" +oom_score = 0 +imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"] + +[grpc] + address = "/run/containerd/containerd.sock" + uid = 0 + gid = 0 + max_recv_message_size = 16777216 + max_send_message_size = 16777216 + +[debug] + address = "" + uid = 0 + gid = 0 + level = "" + +[metrics] + address = "" + grpc_histogram = false + +[cgroup] + path = "" + +[proxy_plugins] +# fuse-overlayfs is used for rootless +[proxy_plugins."fuse-overlayfs"] + type = "snapshot" + address = "/run/containerd-fuse-overlayfs.sock" + +[plugins] + [plugins."io.containerd.monitor.v1.cgroups"] + no_prometheus = false + [plugins."io.containerd.grpc.v1.cri"] + stream_server_address = "" + stream_server_port = "10010" + enable_selinux = false + sandbox_image = "k8s.gcr.io/pause:3.6" + stats_collect_period = 10 + enable_tls_streaming = false + max_container_log_line_size = 16384 + restrict_oom_score_adj = false + + [plugins."io.containerd.grpc.v1.cri".containerd] + discard_unpacked_layers = true + snapshotter = "overlayfs" + [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] + runtime_type = "" + runtime_engine = "" + runtime_root = "" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = false + + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/opt/cni/bin" + conf_dir = "/etc/cni/net.mk" + conf_template = "" + [plugins."io.containerd.grpc.v1.cri".registry] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + endpoint = ["https://registry-1.docker.io"] + [plugins."io.containerd.service.v1.diff-service"] + default = ["walking"] + [plugins."io.containerd.gc.v1.scheduler"] + pause_threshold = 0.02 + deletion_threshold = 0 + mutation_threshold = 100 + schedule_delay = "0s" + startup_delay = "100ms" diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 2b96ba21bd..b235bd0c1f 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -45,79 +45,26 @@ import ( const ( containerdNamespaceRoot = "/run/containerd/runc/k8s.io" // ContainerdConfFile is the path to the containerd configuration - containerdConfigFile = "/etc/containerd/config.toml" + containerdConfigFile = "/etc/containerd/containerd.conf.d/02-containerd.conf" containerdConfigTemplate = `version = 2 -root = "/var/lib/containerd" -state = "/run/containerd" -oom_score = 0 -[grpc] - address = "/run/containerd/containerd.sock" - uid = 0 - gid = 0 - max_recv_message_size = 16777216 - max_send_message_size = 16777216 +[plugins."io.containerd.grpc.v1.cri"] + sandbox_image = "{{ .PodInfraContainerImage }}" + restrict_oom_score_adj = {{ .InUserNamespace }} -[debug] - address = "" - uid = 0 - gid = 0 - level = "" + [plugins."io.containerd.grpc.v1.cri".containerd] + {{ if .InUserNamespace }} + snapshotter = "fuse-overlayfs" + {{ end }} + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = {{ .SystemdCgroup }} -[metrics] - address = "" - grpc_histogram = false + [plugins."io.containerd.grpc.v1.cri".cni] + conf_dir = "{{.CNIConfDir}}" -[cgroup] - path = "" - -[plugins] - [plugins."io.containerd.monitor.v1.cgroups"] - no_prometheus = false - [plugins."io.containerd.grpc.v1.cri"] - stream_server_address = "" - stream_server_port = "10010" - enable_selinux = false - sandbox_image = "{{ .PodInfraContainerImage }}" - stats_collect_period = 10 - enable_tls_streaming = false - max_container_log_line_size = 16384 - restrict_oom_score_adj = {{ .RestrictOOMScoreAdj }} - - [plugins."io.containerd.grpc.v1.cri".containerd] - discard_unpacked_layers = true - snapshotter = "{{ .Snapshotter }}" - [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] - runtime_type = "io.containerd.runc.v2" - [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] - runtime_type = "" - runtime_engine = "" - runtime_root = "" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = {{ .SystemdCgroup }} - - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/opt/cni/bin" - conf_dir = "{{.CNIConfDir}}" - conf_template = "" - [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] - {{ range .InsecureRegistry -}} - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{. -}}"] - endpoint = ["http://{{. -}}"] - {{ end -}} - [plugins."io.containerd.service.v1.diff-service"] - default = ["walking"] - [plugins."io.containerd.gc.v1.scheduler"] - pause_threshold = 0.02 - deletion_threshold = 0 - mutation_threshold = 100 - schedule_delay = "0s" - startup_delay = "100ms" + {{ range .InsecureRegistry -}} + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{. -}}"] + endpoint = ["http://{{. -}}"] + {{ end -}} ` ) @@ -193,7 +140,7 @@ func (r *Containerd) Available() error { return nil } -// generateContainerdConfig sets up /etc/containerd/config.toml +// generateContainerdConfig sets up /etc/containerd/containerd.conf.d/02-containerd.conf func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semver.Version, forceSystemd bool, insecureRegistry []string, inUserNamespace bool) error { cPath := containerdConfigFile t, err := template.New("containerd.config.toml").Parse(containerdConfigTemplate) @@ -201,21 +148,18 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve return err } pauseImage := images.Pause(kv, imageRepository) - snapshotter := "overlayfs" opts := struct { PodInfraContainerImage string SystemdCgroup bool InsecureRegistry []string CNIConfDir string - RestrictOOMScoreAdj bool - Snapshotter string + InUserNamespace bool }{ PodInfraContainerImage: pauseImage, SystemdCgroup: forceSystemd, InsecureRegistry: insecureRegistry, CNIConfDir: cni.ConfDir, - RestrictOOMScoreAdj: inUserNamespace, - Snapshotter: snapshotter, + InUserNamespace: inUserNamespace, } var b bytes.Buffer if err := t.Execute(&b, opts); err != nil { From cf036c63ed9ade0623a678f1d7b32144e9b6ccb2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 18 Mar 2022 09:56:36 -0700 Subject: [PATCH 02/17] rename config file to config.toml --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 2d1c4ca9dd..4c434061bd 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -44,7 +44,7 @@ ARG CRIO_VERSION="1.22" COPY deploy/kicbase/10-network-security.conf /etc/sysctl.d/10-network-security.conf COPY deploy/kicbase/11-tcp-mtu-probing.conf /etc/sysctl.d/11-tcp-mtu-probing.conf COPY deploy/kicbase/02-crio.conf /etc/crio/crio.conf.d/02-crio.conf -COPY deploy/kicbase/containerd.toml /etc/containerd/containerd.toml +COPY deploy/kicbase/containerd.toml /etc/containerd/config.toml COPY deploy/kicbase/clean-install /usr/local/bin/clean-install COPY deploy/kicbase/entrypoint /usr/local/bin/entrypoint COPY --from=0 /src/cmd/auto-pause/auto-pause /bin/auto-pause From 0cda289d884c625bff93e9c2e1dee2a27616eba9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 18 Mar 2022 11:52:17 -0700 Subject: [PATCH 03/17] set flags to auto resolve config file conflicts --- deploy/kicbase/clean-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/clean-install b/deploy/kicbase/clean-install index 33b3238b75..84a467d8d7 100755 --- a/deploy/kicbase/clean-install +++ b/deploy/kicbase/clean-install @@ -26,7 +26,7 @@ if [ $# = 0 ]; then fi apt-get update -apt-get install -y --no-install-recommends "$@" +apt-get install -y --no-install-recommends -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" "$@" apt-get clean -y rm -rf \ /var/cache/debconf/* \ From 614836d51cd9560e81fdb6f5f1294683e308c5df Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 22 Mar 2022 13:50:06 -0700 Subject: [PATCH 04/17] prevent imported config file from overwriting --- pkg/minikube/cruntime/containerd.go | 63 +++++++++++++---------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index b235bd0c1f..1d123435bf 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -45,26 +45,13 @@ import ( const ( containerdNamespaceRoot = "/run/containerd/runc/k8s.io" // ContainerdConfFile is the path to the containerd configuration - containerdConfigFile = "/etc/containerd/containerd.conf.d/02-containerd.conf" - containerdConfigTemplate = `version = 2 -[plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "{{ .PodInfraContainerImage }}" - restrict_oom_score_adj = {{ .InUserNamespace }} - - [plugins."io.containerd.grpc.v1.cri".containerd] - {{ if .InUserNamespace }} - snapshotter = "fuse-overlayfs" - {{ end }} - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = {{ .SystemdCgroup }} - - [plugins."io.containerd.grpc.v1.cri".cni] - conf_dir = "{{.CNIConfDir}}" - - {{ range .InsecureRegistry -}} - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{. -}}"] - endpoint = ["http://{{. -}}"] - {{ end -}} + containerdConfigFile = "/etc/containerd/config.toml" + containerdImportedConfigFile = "/etc/containerd/containerd.conf.d/02-containerd.conf" + containerdConfigTemplate = `version = 2 +{{ range .InsecureRegistry -}} +[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{. -}}"] + endpoint = ["http://{{. -}}"] +{{ end -}} ` ) @@ -140,26 +127,34 @@ func (r *Containerd) Available() error { return nil } -// generateContainerdConfig sets up /etc/containerd/containerd.conf.d/02-containerd.conf +// generateContainerdConfig sets up /etc/containerd/config.toml & /etc/containerd/containerd.conf.d/02-containerd.conf func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semver.Version, forceSystemd bool, insecureRegistry []string, inUserNamespace bool) error { - cPath := containerdConfigFile - t, err := template.New("containerd.config.toml").Parse(containerdConfigTemplate) + pauseImage := images.Pause(kv, imageRepository) + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*sandbox_image = .*$|sandbox_image = \"%s\"|' -i %s", pauseImage, containerdConfigFile))); err != nil { + return errors.Wrap(err, "update sandbox_image") + } + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*restrict_oom_score_adj = .*$|restrict_oom_score_adj = \"%t\"|' -i %s", inUserNamespace, containerdConfigFile))); err != nil { + return errors.Wrap(err, "update restrict_oom_score_adj") + } + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*SystemdCgroup = .*$|SystemdCgroup = \"%t\"|' -i %s", forceSystemd, containerdConfigFile))); err != nil { + return errors.Wrap(err, "update SystemdCgroup") + } + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { + return errors.Wrap(err, "update conf_dir") + } + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { + return errors.Wrap(err, "update snapshotter") + } + + cPath := containerdImportedConfigFile + t, err := template.New("02-containerd.conf").Parse(containerdConfigTemplate) if err != nil { return err } - pauseImage := images.Pause(kv, imageRepository) opts := struct { - PodInfraContainerImage string - SystemdCgroup bool - InsecureRegistry []string - CNIConfDir string - InUserNamespace bool + InsecureRegistry []string }{ - PodInfraContainerImage: pauseImage, - SystemdCgroup: forceSystemd, - InsecureRegistry: insecureRegistry, - CNIConfDir: cni.ConfDir, - InUserNamespace: inUserNamespace, + InsecureRegistry: insecureRegistry, } var b bytes.Buffer if err := t.Execute(&b, opts); err != nil { From fc33f21dfd34599ec124f2474aa1674527fc2bbe Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Mar 2022 03:48:13 +0000 Subject: [PATCH 05/17] Updating ISO to v1.25.2-1648002791-13807 --- site/content/en/docs/commands/start.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 1136cc82d3..cbf2d6a5ea 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,7 +69,11 @@ 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) +<<<<<<< HEAD --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791.iso]) +======= + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.25.2-1648002791-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648002791-13807/minikube-v1.25.2-1648002791-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648002791-13807.iso]) +>>>>>>> eed46033b (Updating ISO to v1.25.2-1648002791-13807) --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.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 98f2b6f0b642df4703b46568a1bc84a9e13b891e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 23 Mar 2022 09:59:34 -0700 Subject: [PATCH 06/17] fixed adding quotes around bool values --- pkg/minikube/cruntime/containerd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 1d123435bf..8b8863ec31 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -133,10 +133,10 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*sandbox_image = .*$|sandbox_image = \"%s\"|' -i %s", pauseImage, containerdConfigFile))); err != nil { return errors.Wrap(err, "update sandbox_image") } - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*restrict_oom_score_adj = .*$|restrict_oom_score_adj = \"%t\"|' -i %s", inUserNamespace, containerdConfigFile))); err != nil { + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*restrict_oom_score_adj = .*$|restrict_oom_score_adj = %t|' -i %s", inUserNamespace, containerdConfigFile))); err != nil { return errors.Wrap(err, "update restrict_oom_score_adj") } - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*SystemdCgroup = .*$|SystemdCgroup = \"%t\"|' -i %s", forceSystemd, containerdConfigFile))); err != nil { + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*SystemdCgroup = .*$|SystemdCgroup = %t|' -i %s", forceSystemd, containerdConfigFile))); err != nil { return errors.Wrap(err, "update SystemdCgroup") } if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { From a29adcd55529c735f0848f33bbcdb2ec39e116a1 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 23 Mar 2022 18:23:55 +0000 Subject: [PATCH 07/17] Updating ISO to v1.25.2-1648055164-13807 --- site/content/en/docs/commands/start.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index cbf2d6a5ea..1136cc82d3 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,11 +69,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) -<<<<<<< HEAD --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791.iso]) -======= - --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.25.2-1648002791-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648002791-13807/minikube-v1.25.2-1648002791-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648002791-13807.iso]) ->>>>>>> eed46033b (Updating ISO to v1.25.2-1648002791-13807) --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.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 1294c2080b7e6c6342380bd17fc87b5a9302b182 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 23 Mar 2022 13:29:57 -0700 Subject: [PATCH 08/17] only use fuse-overlayfs if in user namespace --- pkg/minikube/cruntime/containerd.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 8b8863ec31..819c9dba07 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -142,8 +142,10 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { return errors.Wrap(err, "update conf_dir") } - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { - return errors.Wrap(err, "update snapshotter") + if inUserNamespace { + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { + return errors.Wrap(err, "update snapshotter") + } } cPath := containerdImportedConfigFile From 614726958d38f9ce8778675f4bcdf8d8d3377f31 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 24 Mar 2022 15:05:21 -0700 Subject: [PATCH 09/17] only import when containerd explictly enabled --- .../arch/aarch64/package/containerd-bin-aarch64/config.toml | 2 +- deploy/kicbase/containerd.toml | 2 +- pkg/minikube/cruntime/containerd.go | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml index 25555749c7..26db5a2699 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml @@ -2,7 +2,7 @@ version = 2 root = "/var/lib/containerd" state = "/run/containerd" oom_score = 0 -imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"] +# imports [grpc] address = "/run/containerd/containerd.sock" diff --git a/deploy/kicbase/containerd.toml b/deploy/kicbase/containerd.toml index 07367dfd21..836d49ebed 100644 --- a/deploy/kicbase/containerd.toml +++ b/deploy/kicbase/containerd.toml @@ -2,7 +2,7 @@ version = 2 root = "/var/lib/containerd" state = "/run/containerd" oom_score = 0 -imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"] +# imports [grpc] address = "/run/containerd/containerd.sock" diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 819c9dba07..186f224dd6 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -142,6 +142,10 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { return errors.Wrap(err, "update conf_dir") } + imports := `imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"]` + if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^# imports|%s|' -i %s", imports, containerdConfigFile))); err != nil { + return errors.Wrap(err, "update conf_dir") + } if inUserNamespace { if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { return errors.Wrap(err, "update snapshotter") From c7b0e542ee6c7f92a25e047e97f2a40057eba592 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Sat, 26 Mar 2022 01:57:49 +0430 Subject: [PATCH 10/17] remove overlayfs --- pkg/minikube/cruntime/containerd.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 186f224dd6..f5e4be75af 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -146,11 +146,6 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^# imports|%s|' -i %s", imports, containerdConfigFile))); err != nil { return errors.Wrap(err, "update conf_dir") } - if inUserNamespace { - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*snapshotter = \"overlayfs\"|snapshotter = \"fuse-overlayfs\"|' -i %s", containerdConfigFile))); err != nil { - return errors.Wrap(err, "update snapshotter") - } - } cPath := containerdImportedConfigFile t, err := template.New("02-containerd.conf").Parse(containerdConfigTemplate) From dd444b8ec2688605de7ab5b39635eb7072d3ae23 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Sat, 26 Mar 2022 02:00:01 +0430 Subject: [PATCH 11/17] remove overlayfs from config files --- .../arch/aarch64/package/containerd-bin-aarch64/config.toml | 6 ------ deploy/kicbase/containerd.toml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml index 26db5a2699..b060e08f19 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml @@ -24,12 +24,6 @@ oom_score = 0 [cgroup] path = "" -[proxy_plugins] -# fuse-overlayfs is used for rootless -[proxy_plugins."fuse-overlayfs"] - type = "snapshot" - address = "/run/containerd-fuse-overlayfs.sock" - [plugins] [plugins."io.containerd.monitor.v1.cgroups"] no_prometheus = false diff --git a/deploy/kicbase/containerd.toml b/deploy/kicbase/containerd.toml index 836d49ebed..6270ba5879 100644 --- a/deploy/kicbase/containerd.toml +++ b/deploy/kicbase/containerd.toml @@ -24,12 +24,6 @@ oom_score = 0 [cgroup] path = "" -[proxy_plugins] -# fuse-overlayfs is used for rootless -[proxy_plugins."fuse-overlayfs"] - type = "snapshot" - address = "/run/containerd-fuse-overlayfs.sock" - [plugins] [plugins."io.containerd.monitor.v1.cgroups"] no_prometheus = false From 5161fc29c190990c7327ee03abc2c2648975492b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 12 May 2022 11:06:27 -0700 Subject: [PATCH 12/17] add changes to arm64 iso --- .../containerd-bin-aarch64/containerd-bin.mk | 1 + .../x86_64/package/containerd-bin/config.toml | 139 +++++------------- 2 files changed, 39 insertions(+), 101 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index d019e82c66..2862773751 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -26,6 +26,7 @@ endef define CONTAINERD_BIN_AARCH64_CONFIGURE_CMDS mkdir -p $(CONTAINERD_BIN_AARCH64_GOPATH)/src/github.com/containerd + mkdir -p $(TARGET_DIR)/etc/containerd/containerd.conf.d ln -sf $(@D) $(CONTAINERD_BIN_AARCH64_COMPILE_SRC) endef diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml index f588941a5e..b060e08f19 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml @@ -1,26 +1,16 @@ version = 2 root = "/var/lib/containerd" state = "/run/containerd" -plugin_dir = "" -disabled_plugins = [] -required_plugins = [] oom_score = 0 +# imports [grpc] address = "/run/containerd/containerd.sock" - tcp_address = "" - tcp_tls_cert = "" - tcp_tls_key = "" uid = 0 gid = 0 max_recv_message_size = 16777216 max_send_message_size = 16777216 -[ttrpc] - address = "" - uid = 0 - gid = 0 - [debug] address = "" uid = 0 @@ -34,100 +24,47 @@ oom_score = 0 [cgroup] path = "" -[timeouts] - "io.containerd.timeout.shim.cleanup" = "5s" - "io.containerd.timeout.shim.load" = "5s" - "io.containerd.timeout.shim.shutdown" = "3s" - "io.containerd.timeout.task.state" = "2s" - [plugins] + [plugins."io.containerd.monitor.v1.cgroups"] + no_prometheus = false + [plugins."io.containerd.grpc.v1.cri"] + stream_server_address = "" + stream_server_port = "10010" + enable_selinux = false + sandbox_image = "k8s.gcr.io/pause:3.6" + stats_collect_period = 10 + enable_tls_streaming = false + max_container_log_line_size = 16384 + restrict_oom_score_adj = false + + [plugins."io.containerd.grpc.v1.cri".containerd] + discard_unpacked_layers = true + snapshotter = "overlayfs" + [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] + runtime_type = "" + runtime_engine = "" + runtime_root = "" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = false + + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/opt/cni/bin" + conf_dir = "/etc/cni/net.mk" + conf_template = "" + [plugins."io.containerd.grpc.v1.cri".registry] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + endpoint = ["https://registry-1.docker.io"] + [plugins."io.containerd.service.v1.diff-service"] + default = ["walking"] [plugins."io.containerd.gc.v1.scheduler"] pause_threshold = 0.02 deletion_threshold = 0 mutation_threshold = 100 schedule_delay = "0s" startup_delay = "100ms" - [plugins."io.containerd.grpc.v1.cri"] - disable_tcp_service = true - stream_server_address = "" - stream_server_port = "10010" - stream_idle_timeout = "4h0m0s" - enable_selinux = false - selinux_category_range = 1024 - sandbox_image = "k8s.gcr.io/pause:3.2" - stats_collect_period = 10 - systemd_cgroup = true - enable_tls_streaming = false - max_container_log_line_size = 16384 - disable_cgroup = false - disable_apparmor = false - restrict_oom_score_adj = false - max_concurrent_downloads = 3 - disable_proc_mount = false - unset_seccomp_profile = "" - tolerate_missing_hugetlb_controller = true - disable_hugetlb_controller = true - ignore_image_defined_volumes = false - [plugins."io.containerd.grpc.v1.cri".containerd] - snapshotter = "overlayfs" - default_runtime_name = "runc" - no_pivot = false - disable_snapshot_annotations = true - discard_unpacked_layers = false - [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] - runtime_type = "" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime] - runtime_type = "" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - runtime_engine = "" - runtime_root = "" - privileged_without_host_devices = false - base_runtime_spec = "" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/opt/cni/bin" - conf_dir = "/etc/cni/net.d" - max_conf_num = 1 - conf_template = "" - [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] - [plugins."io.containerd.grpc.v1.cri".image_decryption] - key_model = "" - [plugins."io.containerd.grpc.v1.cri".x509_key_pair_streaming] - tls_cert_file = "" - tls_key_file = "" - [plugins."io.containerd.internal.v1.opt"] - path = "/opt/containerd" - [plugins."io.containerd.internal.v1.restart"] - interval = "10s" - [plugins."io.containerd.metadata.v1.bolt"] - content_sharing_policy = "shared" - [plugins."io.containerd.monitor.v1.cgroups"] - no_prometheus = false - [plugins."io.containerd.runtime.v1.linux"] - shim = "containerd-shim" - runtime = "runc" - runtime_root = "" - no_shim = false - shim_debug = false - [plugins."io.containerd.runtime.v2.task"] - platforms = ["linux/amd64"] - [plugins."io.containerd.service.v1.diff-service"] - default = ["walking"] - [plugins."io.containerd.snapshotter.v1.devmapper"] - root_path = "" - pool_name = "" - base_image_size = "" - async_remove = false From 692024115b5033ae6d9dd0acfa4577d2f81a576e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 12 May 2022 20:27:20 +0000 Subject: [PATCH 13/17] Updating ISO to v1.25.2-1652379308-13807 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d164099fd..2799b3090c 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.25.2-1652310010-13791 +ISO_VERSION ?= v1.25.2-1652379308-13807 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 88ee7f145d..dcbe6c9089 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/13791" + isoBucket := "minikube-builds/iso/13807" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 1136cc82d3..a997cf0bde 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,7 +69,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-builds/iso/13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.25.2-1652379308-13807-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652379308-13807/minikube-v1.25.2-1652379308-13807-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652379308-13807-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.25.2-1652379308-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652379308-13807/minikube-v1.25.2-1652379308-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652379308-13807.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.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 266138dac4b636f81c9b27943034cbbaf1d5a59d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 13 May 2022 00:28:43 +0000 Subject: [PATCH 14/17] Updating kicbase image to v0.0.30-1652394862-13807 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 026e62582a..2a20378789 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.30-1652309540-13791" + Version = "v0.0.30-1652394862-13807" // SHA of the kic base image - baseImageSHA = "c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c" + baseImageSHA = "470039ae4fb6cd41e5a15e80280a7f154e46b4b943abca039049973628947f0b" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a997cf0bde..483532178b 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.30-1652309540-13791@sha256:c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.30-1652394862-13807@sha256:470039ae4fb6cd41e5a15e80280a7f154e46b4b943abca039049973628947f0b") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From c59c0317061b19e2448d85171a85b284e95495d3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 19 May 2022 01:12:20 +0000 Subject: [PATCH 15/17] Updating ISO to v1.26.0-1652914268-13807 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5c31fb25a7..9d68ffffaa 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.26.0-beta.0 +ISO_VERSION ?= v1.26.0-1652914268-13807 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 404359a48a..dcbe6c9089 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube/iso" + isoBucket := "minikube-builds/iso/13807" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 420edc6a00..d158043482 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.31@sha256:c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.31@sha256:470039ae4fb6cd41e5a15e80280a7f154e46b4b943abca039049973628947f0b") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) @@ -69,7 +69,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.26.0-beta.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-beta.0/minikube-v1.26.0-beta.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-beta.0-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.0-beta.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-beta.0/minikube-v1.26.0-beta.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-beta.0.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1652914268-13807-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1652914268-13807/minikube-v1.26.0-1652914268-13807-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1652914268-13807-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1652914268-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1652914268-13807/minikube-v1.26.0-1652914268-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1652914268-13807.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.23.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 77c8e7844f049afc4e0d482969ac4a90900decc9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 27 May 2022 20:01:51 +0000 Subject: [PATCH 16/17] Updating kicbase image to v0.0.31-1653677545-13807 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 2de298b003..0e07e1ba71 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.31-1653596720-14230" + Version = "v0.0.31-1653677545-13807" // SHA of the kic base image - baseImageSHA = "e953786303ac8350802546ee187d34e89f0007072a54fdbcc2f86a1fb8575418" + baseImageSHA = "312115a5663b1250effab8ed8ada9435fca80af41962223c98bf66f86b32c52a" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 7c75a3dc22..4c137a9b99 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1653596720-14230@sha256:e953786303ac8350802546ee187d34e89f0007072a54fdbcc2f86a1fb8575418") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1653677545-13807@sha256:312115a5663b1250effab8ed8ada9435fca80af41962223c98bf66f86b32c52a") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b785613d6936397e0a4273ee5b5aab13502b012e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 27 May 2022 21:18:11 +0000 Subject: [PATCH 17/17] Updating ISO to v1.26.0-1653677468-13807 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0605610288..346dfd0614 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.26.0-1652998508-14153 +ISO_VERSION ?= v1.26.0-1653677468-13807 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index a5ecc47cf0..dcbe6c9089 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/14153" + isoBucket := "minikube-builds/iso/13807" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 4c137a9b99..920810ebd1 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,7 +69,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-builds/iso/14153/minikube-v1.26.0-1652998508-14153-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1652998508-14153/minikube-v1.26.0-1652998508-14153-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1652998508-14153-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14153/minikube-v1.26.0-1652998508-14153.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1652998508-14153/minikube-v1.26.0-1652998508-14153.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1652998508-14153.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1653677468-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807.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.23.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube