add extra option fail swap for kic

cmd/minikube/cmd/start.go

@@ -994,9 +994,14 @@ func setDockerProxy() {
 func autoSetDriverOptions(cmd *cobra.Command, drvName string) (err error) {
 	err = nil
 	hints := driver.FlagDefaults(drvName)
-	if !cmd.Flags().Changed("extra-config") && hints.ExtraOptions != "" {
-		glog.Infof("auto setting extra-config to %q.", hints.ExtraOptions)
-		err = extraOptions.Set(hints.ExtraOptions)
+	if !cmd.Flags().Changed("extra-config") && len(hints.ExtraOptions) > 0 {
+		for _, eo := range hints.ExtraOptions {
+			glog.Infof("auto setting extra-config to %q.", eo)
+			err = extraOptions.Set(eo)
+			if err != nil {
+				err = errors.Wrapf(err, "setting extra option %s", eo)
+			}
+		}
 	}
 
 	if !cmd.Flags().Changed(cacheImages) {

pkg/drivers/kic/kic.go

@@ -261,5 +261,5 @@ func (d *Driver) nodeID(nameOrID string) (string, error) {
 
 // BaseImage returns the image used to spin up containers. in the future might pin down nodes per version
 func BaseImage() (string, error) {
-	return "medyagh/kicbase:v0.0.1-snapshot@sha256:fdd103eae33f92673fb13da81104b67576b43ab2affc7855deda596878215a61", nil
+	return "gcr.io/k8s-minikube/kicbase@sha256:c4ad2938877d2ae0d5b7248a5e7182ff58c0603165c3bedfe9d503e2d380a0db", nil
 }

pkg/minikube/driver/driver.go

@@ -82,7 +82,7 @@ func BareMetal(name string) bool {
 
 // FlagHints are hints for what default options should be used for this driver
 type FlagHints struct {
-	ExtraOptions     string
+	ExtraOptions     []string
 	CacheImages      bool
 	ContainerRuntime string
 	Bootstrapper     string
@@ -90,27 +90,27 @@ type FlagHints struct {
 
 // FlagDefaults returns suggested defaults based on a driver
 func FlagDefaults(name string) FlagHints {
+	fh := FlagHints{}
 	if name != None {
-		fh := FlagHints{CacheImages: true}
+		fh.CacheImages = true
 		// only for kic, till other run-times are available we auto-set containerd.
 		if name == Docker {
 			fh.ContainerRuntime = "containerd"
 			fh.Bootstrapper = bootstrapper.KIC
-			fh.ExtraOptions = fmt.Sprintf("kubeadm.pod-network-cidr=%s", kic.DefaultPodCIDR)
+			fh.ExtraOptions = append(fh.ExtraOptions, fmt.Sprintf("kubeadm.pod-network-cidr=%s", kic.DefaultPodCIDR))
+			fh.ExtraOptions = append(fh.ExtraOptions, fmt.Sprintf("kubelet.fail-swap-on=false"))
 		}
 		return fh
 	}
 
+	fh.CacheImages = false
+	// if specifc linux add this option for systemd work on none driver
 	if _, err := os.Stat(systemdResolvConf); err == nil {
-		extraOpts := fmt.Sprintf("kubelet.resolv-conf=%s", systemdResolvConf)
-		return FlagHints{
-			ExtraOptions: extraOpts,
-			CacheImages:  false,
-		}
-	}
-	return FlagHints{
-		CacheImages: false,
+		noneEO := fmt.Sprintf("kubelet.resolv-conf=%s", systemdResolvConf)
+		fh.ExtraOptions = append(fh.ExtraOptions, noneEO)
+		return fh
 	}
+	return fh
 }
 
 // Choices returns a list of drivers which are possible on this system