Skip to content

Commit 419f26d

Browse files
mfojtiksoltysh
authored andcommitted
set fail-swap-on to false for cluster up
1 parent f8c653e commit 419f26d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,9 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
887887
nodeCfg.DNSIP = ""
888888
}
889889
nodeCfg.DNSBindAddress = ""
890+
if nodeCfg.KubeletArguments == nil {
891+
nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
892+
}
890893

891894
if h.supportsCgroupDriver() {
892895
// Set the cgroup driver from the current docker
@@ -895,11 +898,9 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
895898
return err
896899
}
897900
glog.V(5).Infof("cgroup driver from Docker: %s", cgroupDriver)
898-
if nodeCfg.KubeletArguments == nil {
899-
nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
900-
}
901901
nodeCfg.KubeletArguments["cgroup-driver"] = []string{cgroupDriver}
902902
}
903+
nodeCfg.KubeletArguments["fail-swap-on"] = []string{"false"}
903904

904905
cfgBytes, err = configapilatest.WriteYAML(nodeCfg)
905906
if err != nil {

0 commit comments

Comments
 (0)