Merge branch 'master' of https://github.com/kubernetes/minikube into yaml-node-helper

Author: baohuy1303

.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.a
 *.so
+__debug_bin*
 
 # Folders
 .cache

Makefile

@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.38.0-1783341217-23308
+ISO_VERSION ?= v1.38.0-1783772866-23337
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

cmd/minikube/cmd/node_add.go

@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/cmd/minikube/cmd/flags"
 	"k8s.io/minikube/pkg/minikube/cni"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -81,10 +82,14 @@ var nodeAddCmd = &cobra.Command{
 			KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
 		}
 
-		// Make sure to decrease the default amount of memory we use per VM if this is the first worker node
 		if len(cc.Nodes) == 1 {
 			if viper.GetString(memory) == "" {
-				cc.Memory = 2200
+				sysLimit, containerLimit, err := memoryLimits(cc.Driver)
+				if err != nil {
+					klog.Warningf("Unable to query memory limits: %v", err)
+				}
+				totalNodes := len(cc.Nodes) + 1
+				cc.Memory = suggestMemoryAllocation(sysLimit, containerLimit, totalNodes)
 			}
 
 			if !cc.MultiNodeRequested && cni.IsDisabled(*cc) {

cmd/minikube/cmd/node_delete.go

@@ -34,12 +34,13 @@ import (
 )
 
 var nodeDeleteCmd = &cobra.Command{
-	Use:   "delete",
-	Short: "Deletes a node from a cluster.",
-	Long:  "Deletes a node from a cluster.",
+	Use:     "delete NODE_NAME",
+	Short:   "Deletes a node from a cluster.",
+	Long:    "Deletes a node from a cluster.",
+	Example: "minikube node delete m02",
 	Run: func(_ *cobra.Command, args []string) {
 		if len(args) == 0 {
-			exit.Message(reason.Usage, "Usage: minikube node delete [name]")
+			exit.Message(reason.Usage, "Usage: minikube node delete NODE_NAME")
 		}
 
 		options := flags.CommandOptions()

cmd/minikube/cmd/node_start.go

@@ -34,12 +34,13 @@ import (
 )
 
 var nodeStartCmd = &cobra.Command{
-	Use:   "start",
-	Short: "Starts a node.",
-	Long:  "Starts an existing stopped node in a cluster.",
+	Use:     "start NODE_NAME",
+	Short:   "Starts a node.",
+	Long:    "Starts an existing stopped node in a cluster.",
+	Example: "minikube node start m02",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			exit.Message(reason.Usage, "Usage: minikube node start [name]")
+			exit.Message(reason.Usage, "Usage: minikube node start NODE_NAME")
 		}
 
 		options := flags.CommandOptions()

cmd/minikube/cmd/node_stop.go

@@ -32,12 +32,13 @@ import (
 )
 
 var nodeStopCmd = &cobra.Command{
-	Use:   "stop",
-	Short: "Stops a node in a cluster.",
-	Long:  "Stops a node in a cluster.",
+	Use:     "stop NODE_NAME",
+	Short:   "Stops a node in a cluster.",
+	Long:    "Stops a node in a cluster.",
+	Example: "minikube node stop m02",
 	Run: func(_ *cobra.Command, args []string) {
 		if len(args) == 0 {
-			exit.Message(reason.Usage, "Usage: minikube node stop [name]")
+			exit.Message(reason.Usage, "Usage: minikube node stop NODE_NAME")
 		}
 
 		options := flags.CommandOptions()

deploy/addons/kubevirt/pod.yaml.tmpl

@@ -9,7 +9,7 @@ metadata:
 data:
   uninstall.sh: |
     #!/bin/bash
-    export KUBEVIRT_VERSION="v1.8.2"
+    export KUBEVIRT_VERSION="v1.8.4"
 
     kubectl delete kubevirt kubevirt -n kubevirt
 
@@ -18,7 +18,7 @@ data:
     #!/bin/bash
 
     # To update: check https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt
-    export KUBEVIRT_VERSION="v1.8.2"
+    export KUBEVIRT_VERSION="v1.8.4"
     echo "Installing KubeVirt version: $KUBEVIRT_VERSION"
 
     kubectl create -f "https://github.com/kubevirt/kubevirt/releases/download/${KUBEVIRT_VERSION}/kubevirt-operator.yaml"

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash

@@ -4,3 +4,4 @@ sha256 dac15a0d412a24be8bfe6a40cec8f51829062725169f1e72ac7d120a891ef5b6 containe
 sha256 06623dc8719b30d06303420f7eae91b0a9ade4e71243a4102f6375e585fb0a42 containerd-2.3.0-linux-arm64.tar.gz
 sha256 46a83603a850f3916ca7c942310daaf82ed17773a85b1d431e92d4a541e46d0d containerd-2.3.1-linux-arm64.tar.gz
 sha256 6874adea935300402b7782d63bf58f1bd59a3323d76a9f22f27686001fb8997a containerd-2.3.2-linux-arm64.tar.gz
+sha256 9cc708f13c31588a2fbdbd13553d963356e990d50e9b95a2d6120f4ff2067910 containerd-2.3.3-linux-arm64.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONTAINERD_BIN_AARCH64_VERSION = 2.3.2
+CONTAINERD_BIN_AARCH64_VERSION = 2.3.3
 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/releases/download/v$(CONTAINERD_BIN_AARCH64_VERSION)
 CONTAINERD_BIN_AARCH64_SOURCE = containerd-$(CONTAINERD_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
 CONTAINERD_BIN_AARCH64_STRIP_COMPONENTS = 0

deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash

@@ -4,3 +4,4 @@ sha256 f5d8e90ecb6c1c7e33ecddf8cc268a93b9e5b54e0e850320d765511d76624f41 containe
 sha256 4cb83e7100a5e73fcb626207d0b5bcfd1294e26aeddfe075dcfb38f375c5f887 containerd-2.3.0-linux-amd64.tar.gz
 sha256 628448bd973610c656c1cbea8e88b32fafd85b23cc1aa4a3372eb7198478c054 containerd-2.3.1-linux-amd64.tar.gz
 sha256 75625e6f6595bb95f3fb9c8123a60534af4a8d9b52d7617065967bcefe71a17a containerd-2.3.2-linux-amd64.tar.gz
+sha256 ebf6e710056312628eaf6fb4a1c32f0a4ae5f812568321be4029389d66fc7c7c containerd-2.3.3-linux-amd64.tar.gz