Merge pull request #17410 from liggitt/version-check-fail-swap-on

Automatic merge from submit-queue (batch tested with PRs 17405, 17410).

Gate fail-swap-on flag with a version check

Move "fail-on-swap" logic into "openshift start --write-config"

Author: openshift-merge-robot

pkg/cmd/server/admin/create_nodeconfig.go

@@ -44,6 +44,8 @@ type CreateNodeConfigOptions struct {
 	DNSRecursiveResolvConf string
 	ListenAddr             flagtypes.Addr
 
+	KubeletArguments map[string][]string
+
 	ClientCertFile    string
 	ClientKeyFile     string
 	ServerCertFile    string
@@ -420,6 +422,8 @@ func (o CreateNodeConfigOptions) MakeNodeConfig(serverCertFile, serverKeyFile, n
 			NetworkPluginName: o.NetworkPluginName,
 		},
 
+		KubeletArguments: o.KubeletArguments,
+
 		EnableUnidling: true,
 	}
 

pkg/cmd/server/start/start_node.go

@@ -345,6 +345,10 @@ func (o NodeOptions) createNodeConfig() (string, error) {
 		APIServerURL:     masterAddr.String(),
 		APIServerCAFiles: []string{admin.DefaultCABundleFile(o.NodeArgs.MasterCertDir)},
 
+		KubeletArguments: map[string][]string{
+			"fail-swap-on": {"false"},
+		},
+
 		NodeClientCAFile: getSignerOptions.CertFile,
 		ExpireDays:       o.ExpireDays,
 		Output:           cmdutil.NewGLogWriterV(3),

pkg/oc/bootstrap/docker/openshift/helper.go

@@ -887,9 +887,6 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
 		nodeCfg.DNSIP = ""
 	}
 	nodeCfg.DNSBindAddress = ""
-	if nodeCfg.KubeletArguments == nil {
-		nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
-	}
 
 	if h.supportsCgroupDriver() {
 		// Set the cgroup driver from the current docker
@@ -898,9 +895,11 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
 			return err
 		}
 		glog.V(5).Infof("cgroup driver from Docker: %s", cgroupDriver)
+		if nodeCfg.KubeletArguments == nil {
+			nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
+		}
 		nodeCfg.KubeletArguments["cgroup-driver"] = []string{cgroupDriver}
 	}
-	nodeCfg.KubeletArguments["fail-swap-on"] = []string{"false"}
 
 	cfgBytes, err = configapilatest.WriteYAML(nodeCfg)
 	if err != nil {