Merge pull request kubernetes#125157 from carlory/kubeadm-2563

k8s-ci-robot · web-flow · commit 548d50da98f0 · 2024-06-03T04:20:55.000-07:00
kubeadm: update warning message for the swap check
diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go
@@ -651,7 +651,9 @@ func (swc SwapCheck) Check() (warnings, errorList []error) {
 	}
 
 	if len(buf) > 1 {
-		return []error{errors.New("swap is supported for cgroup v2 only; the NodeSwap feature gate of the kubelet is beta but disabled by default")}, nil
+		return []error{errors.New("swap is supported for cgroup v2 only. " +
+			"The kubelet must be properly configured to use swap. Please refer to https://kubernetes.io/docs/concepts/architecture/nodes/#swap-memory, " +
+			"or disable swap on the node")}, nil
 	}
 
 	return nil, nil

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,9 @@ func (swc SwapCheck) Check() (warnings, errorList []error) {`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`if len(buf) > 1 {`
`654`		`- return []error{errors.New("swap is supported for cgroup v2 only; the NodeSwap feature gate of the kubelet is beta but disabled by default")}, nil`
	`654`	`+ return []error{errors.New("swap is supported for cgroup v2 only. " +`
	`655`	`+ "The kubelet must be properly configured to use swap. Please refer to https://kubernetes.io/docs/concepts/architecture/nodes/#swap-memory, " +`
	`656`	`+ "or disable swap on the node")}, nil`
`655`	`657`	`}`
`656`	`658`
`657`	`659`	`return nil, nil`