Merge remote-tracking branch 'upstream/master' into dev-1.20

content/en/docs/setup/best-practices/node-conformance.md

@@ -25,10 +25,11 @@ daemons installed:
 ## Running Node Conformance Test
 
 To run the node conformance test, perform the following steps:
-
-1. Point your Kubelet to localhost `--api-servers="http://localhost:8080"`,
-because the test framework starts a local master to test Kubelet. There are some
-other Kubelet flags you may care:
+1. Work out the value of the `--kubeconfig` option for the kubelet; for example:
+   `--kubeconfig=/var/lib/kubelet/config.yaml`.
+    Because the test framework starts a local control plane to test the kubelet,
+    use `http://localhost:8080` as the URL of the API server.
+    There are some other kubelet command line parameters you may want to use:
   * `--pod-cidr`: If you are using `kubenet`, you should specify an arbitrary CIDR
     to Kubelet, for example `--pod-cidr=10.180.0.0/24`.
   * `--cloud-provider`: If you are using `--cloud-provider=gce`, you should

content/en/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

@@ -50,7 +50,7 @@ this example.
 
 
 1. Configure the kubelet to be a service manager for etcd.
-  
+
    {{< note >}}You must do this on every host where etcd should be running.{{< /note >}}
     Since etcd was created first, you must override the service priority by creating a new unit file
     that has higher precedence than the kubeadm-provided kubelet unit file.
@@ -68,6 +68,12 @@ this example.
     systemctl restart kubelet
     ```
 
+    Check the kubelet status to ensure it is running.
+
+    ```sh
+    systemctl status kubelet
+    ```
+
 1. Create configuration files for kubeadm.
 
     Generate one kubeadm configuration file for each host that will have an etcd