Merge pull request #10220 from johngmyers/automated-cherry-pick-of-#1…

…0219-upstream-release-1.19 Automated cherry pick of #10219: Update validate cluster cli docs
kubernetes · Nov 11, 2020 · 583d9fe · 583d9fe
2 parents 6af1e28 + f52abe1
commit 583d9fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cmd/kops/validate_cluster.go b/cmd/kops/validate_cluster.go
@@ -60,10 +60,10 @@ func NewCmdValidateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	validateClusterLong := templates.LongDesc(i18n.T(`
 	This commands validates the following components:
 
-	1. All k8s masters are running and have "Ready" status.
-	2. All k8s nodes are running and have "Ready" status.
-	3. Component status returns healthy for all components.
-	4. All pods with a critical priority are running and healthy.
+	1. All control plane nodes are running and have "Ready" status.
+	2. All worker nodes are running and have "Ready" status.
+	3. All control plane nodes have the expected pods.
+	4. All pods with a critical priority are running and have "Ready" status.
 	`))
 
 	cmd := &cobra.Command{

diff --git a/docs/cli/kops_validate_cluster.md b/docs/cli/kops_validate_cluster.md
@@ -9,10 +9,10 @@ Validate a kops cluster.
 
 This commands validates the following components:
 
-  1.  All k8s masters are running and have "Ready" status.
-  2.  All k8s nodes are running and have "Ready" status.
-  3.  Component status returns healthy for all components.
-  4.  All pods with a critical priority are running and healthy.
+  1.  All control plane nodes are running and have "Ready" status.
+  2.  All worker nodes are running and have "Ready" status.
+  3.  All control plane nodes have the expected pods.
+  4.  All pods with a critical priority are running and have "Ready" status.
 
 ```
 kops validate cluster [flags]