kvm2 driver: add dedicated network & static ip

Author: prezha

cmd/minikube/cmd/start_flags.go

@@ -62,6 +62,7 @@ const (
 	hypervUseExternalSwitch = "hyperv-use-external-switch"
 	hypervExternalAdapter   = "hyperv-external-adapter"
 	kvmNetwork              = "kvm-network"
+	kvmPrivateNetwork       = "kvm-private-network"
 	kvmQemuURI              = "kvm-qemu-uri"
 	kvmGPU                  = "kvm-gpu"
 	kvmHidden               = "kvm-hidden"
@@ -191,7 +192,8 @@ func initDriverFlags() {
 	startCmd.Flags().Bool("vm", false, "Filter to use only VM Drivers")
 
 	// kvm2
-	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (kvm2 driver only)")
+	startCmd.Flags().String(kvmNetwork, "default", "The KVM default network name. (kvm2 driver only)")
+	startCmd.Flags().String(kvmPrivateNetwork, "", "The KVM private network name. (kvm2 driver only) (default: 'mk-<cluster_name>')")
 	startCmd.Flags().String(kvmQemuURI, "qemu:///system", "The KVM QEMU connection URI. (kvm2 driver only)")
 	startCmd.Flags().Bool(kvmGPU, false, "Enable experimental NVIDIA GPU support in minikube")
 	startCmd.Flags().Bool(kvmHidden, false, "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)")
@@ -342,6 +344,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 			HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch),
 			HypervExternalAdapter:   viper.GetString(hypervExternalAdapter),
 			KVMNetwork:              viper.GetString(kvmNetwork),
+			KVMPrivateNetwork:       viper.GetString(kvmPrivateNetwork),
 			KVMQemuURI:              viper.GetString(kvmQemuURI),
 			KVMGPU:                  viper.GetBool(kvmGPU),
 			KVMHidden:               viper.GetBool(kvmHidden),
@@ -380,6 +383,10 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 			},
 			MultiNodeRequested: viper.GetInt(nodes) > 1,
 		}
+		// if KVMPrivateNetwork is not user-defined, defaults to "mk-<cluster_name>"
+		if cc.KVMPrivateNetwork == "" {
+			cc.KVMPrivateNetwork = fmt.Sprintf("mk-%s", cc.KubernetesConfig.ClusterName)
+		}
 		cc.VerifyComponents = interpretWaitFlag(*cmd)
 		if viper.GetBool(createMount) && driver.IsKIC(drvName) {
 			cc.ContainerVolumeMounts = []string{viper.GetString(mountString)}
@@ -554,7 +561,15 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	}
 
 	if cmd.Flags().Changed(kvmNetwork) {
-		cc.KVMNetwork = viper.GetString(kvmNetwork)
+		if cc.KVMNetwork != viper.GetString(kvmNetwork) {
+			out.WarningT("You cannot change the KVM Default Network name for an exiting minikube cluster. Please first delete the cluster.")
+		}
+	}
+
+	if cmd.Flags().Changed(kvmPrivateNetwork) {
+		if cc.KVMPrivateNetwork != viper.GetString(kvmPrivateNetwork) {
+			out.WarningT("You cannot change the KVM Private Network name for an exiting minikube cluster. Please first delete the cluster.")
+		}
 	}
 
 	if cmd.Flags().Changed(kvmQemuURI) {

pkg/minikube/config/types.go

@@ -52,11 +52,12 @@ type ClusterConfig struct {
 	HypervVirtualSwitch     string
 	HypervUseExternalSwitch bool
 	HypervExternalAdapter   string
-	KVMNetwork              string   // Only used by the KVM driver
-	KVMQemuURI              string   // Only used by kvm2
-	KVMGPU                  bool     // Only used by kvm2
-	KVMHidden               bool     // Only used by kvm2
-	KVMNUMACount            int      // Only used by kvm2
+	KVMNetwork              string   // Only used by the KVM2 driver
+	KVMPrivateNetwork       string   // Only used by the KVM2 driver
+	KVMQemuURI              string   // Only used by the KVM2 driver
+	KVMGPU                  bool     // Only used by the KVM2 driver
+	KVMHidden               bool     // Only used by the KVM2 driver
+	KVMNUMACount            int      // Only used by the KVM2 driver
 	DockerOpt               []string // Each entry is formatted as KEY=VALUE.
 	DisableDriverMounts     bool     // Only used by virtualbox
 	NFSShare                []string

pkg/minikube/registry/drvs/kvm2/kvm2.go

@@ -83,7 +83,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 		Memory:         cc.Memory,
 		CPU:            cc.CPUs,
 		Network:        cc.KVMNetwork,
-		PrivateNetwork: "minikube-net",
+		PrivateNetwork: cc.KVMPrivateNetwork,
 		Boot2DockerURL: download.LocalISOResource(cc.MinikubeISO),
 		DiskSize:       cc.DiskSize,
 		DiskPath:       filepath.Join(localpath.MiniPath(), "machines", name, fmt.Sprintf("%s.rawdisk", name)),

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

@@ -69,8 +69,9 @@ minikube start [flags]
       --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.20.2, 'latest' for v1.20.5-rc.0). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
       --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
-      --kvm-network string                The KVM network name. (kvm2 driver only) (default "default")
+      --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")
       --kvm-numa-count int                Simulate numa node count in minikube, supported numa node count range is 1-8 (kvm2 driver only) (default 1)
+      --kvm-private-network string        The KVM private network name. (kvm2 driver only) (default: 'mk-<cluster_name>')
       --kvm-qemu-uri string               The KVM QEMU connection URI. (kvm2 driver only) (default "qemu:///system")
       --listen-address string             IP Address to use to expose ports (docker and podman driver only)
       --memory string                     Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g).