Merge pull request #55399 from kad/swap-error

Automatic merge from submit-queue (batch tested with PRs 55380, 55399, 55377, 55055). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Make swap check as an error **What this PR does / why we need it**: Based on amount of support issues where warning about enabled swap not noticed or ignored, it will be better to make this check as an error. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: cc @luxas attention @jpbetz : this change planned to be also cherrypicked to 1.8 branch. /area kubeadm /sig cluster-lifecycle **Release note**: ```release-note kubeadm now produces error during preflight checks if swap is enabled. Users, who can setup kubelet to run in unsupported environment with enabled swap, will be able to skip that preflight check. ```

Merge pull request #55399 from kad/swap-error
e8c659c8 · Kubernetes Submit Queue · GitHub · aedba56c · 2a1496c2 · e8c659c8
Unverified Commit e8c659c8 authored Nov 09, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

checks.go cmd/kubeadm/app/preflight/checks.go +1 -1

No files found.
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -545,7 +545,7 @@ func (swc SwapCheck) Check() (warnings, errors []error) {
 	}

 	if len(buf) > 1 {
-		return []error{fmt.Errorf("running with swap on is not supported. Please disable swap or set kubelet's --fail-swap-on flag to false")}, nil
+		return nil, []error{fmt.Errorf("running with swap on is not supported. Please disable swap")}
 	}

 	return nil, nil