Make "openshift start node --write-config" tolerate swap on

openshift · Nov 21, 2017 · 2b69c32 · 2b69c32
1 parent 5bb0613
commit 2b69c32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/cmd/server/admin/create_nodeconfig.go b/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,
 	}
 

diff --git a/pkg/cmd/server/start/start_node.go b/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),