From 3bf7d6658afa39ed354acda6a1ee752b295aecaf Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 14 Mar 2017 16:34:43 +0000 Subject: [PATCH 1/4] Update kubeadm.md A couple of minor grammatical errors. --- docs/getting-started-guides/kubeadm.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/kubeadm.md b/docs/getting-started-guides/kubeadm.md index b8c72cadee..20f89817b4 100644 --- a/docs/getting-started-guides/kubeadm.md +++ b/docs/getting-started-guides/kubeadm.md @@ -216,14 +216,14 @@ To help diagnose what happened, you can use the following command to check what kubectl describe -n kube-system po {YOUR_POD_NAME} ``` -Do not using kubectl logs. You will got the following error: +Do not use kubectl logs. You will get the following error: ``` # kubectl logs -n kube-system canal-node-f0lqp Error from server (BadRequest): the server rejected our request for an unknown reason (get pods canal-node-f0lqp) ``` -The ```kubectl describe``` comand gives you more details about the logs +The ```kubectl describe``` command gives you more details about the logs ``` # kubectl describe -n kube-system po kube-dns-2924299975-1l2t7 @@ -236,7 +236,7 @@ Or 6m 1m 191 {kubelet nac} Warning FailedSync Error syncing pod, skipping: failed to "SetupNetwork" for "kube-dns-2924299975-1l2t7_kube-system" with SetupNetworkError: "Failed to setup network for pod \"kube-dns-2924299975-1l2t7_kube-system(dee8ef21-fbcb-11e6-ba19-38d547e0006a)\" using network plugins \"cni\": open /run/flannel/subnet.env: no such file or directory; Skipping pod" ``` -You can then do some Google searches on the error messages, which may help you to find some solutions. +You can then search Google for the error messages, which may help you find a solution. ### (4/4) Joining your nodes From e13b255f898518c5dff657fb2c35d38e447a92d0 Mon Sep 17 00:00:00 2001 From: chenhuan12 Date: Wed, 22 Mar 2017 09:57:12 +0800 Subject: [PATCH 2/4] fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、Delete the row "NAME READY REASON RESTARTS AGE"; 2、fix command kubectl get nodes output. --- docs/user-guide/introspection-and-debugging.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/user-guide/introspection-and-debugging.md b/docs/user-guide/introspection-and-debugging.md index 47d1293900..ff0bb99539 100644 --- a/docs/user-guide/introspection-and-debugging.md +++ b/docs/user-guide/introspection-and-debugging.md @@ -120,7 +120,6 @@ A common scenario that you can detect using events is when you've created a Pod ```shell $ kubectl get pods -NAME READY REASON RESTARTS AGE NAME READY STATUS RESTARTS AGE nginx-deployment-1006230814-6winp 1/1 Running 0 7m nginx-deployment-1006230814-fmgu3 1/1 Running 0 7m @@ -264,11 +263,11 @@ Sometimes when debugging it can be useful to look at the status of a node -- for ```shell $ kubectl get nodes -NAME LABELS STATUS -kubernetes-node-861h kubernetes.io/hostname=kubernetes-node-861h NotReady -kubernetes-node-bols kubernetes.io/hostname=kubernetes-node-bols Ready -kubernetes-node-st6x kubernetes.io/hostname=kubernetes-node-st6x Ready -kubernetes-node-unaj kubernetes.io/hostname=kubernetes-node-unaj Ready +NAME STATUS AGE +kubernetes-node-861h NotReady 1h +kubernetes-node-bols Ready 1h +kubernetes-node-st6x Ready 1h +kubernetes-node-unaj Ready 1h $ kubectl describe node kubernetes-node-861h Name: kubernetes-node-861h From b6b25fc934d476f00bf7d71fe13255ae1c6a66c8 Mon Sep 17 00:00:00 2001 From: Di Wu Date: Sun, 19 Mar 2017 14:34:29 -0700 Subject: [PATCH 3/4] fixing typo --- docs/tasks/debug-application-cluster/logging-stackdriver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/debug-application-cluster/logging-stackdriver.md b/docs/tasks/debug-application-cluster/logging-stackdriver.md index b382d0faf7..b2946616a4 100644 --- a/docs/tasks/debug-application-cluster/logging-stackdriver.md +++ b/docs/tasks/debug-application-cluster/logging-stackdriver.md @@ -5,7 +5,7 @@ assignees: title: Logging Using Stackdriver --- -Before reading this page, it's highly recommended to familiasrize yourself with the [overview of logging in Kubernetes](/docs/user-guide/logging/overview). +Before reading this page, it's highly recommended to familiarize yourself with the [overview of logging in Kubernetes](/docs/user-guide/logging/overview). This article assumes that you have created a Kubernetes cluster with cluster-level logging support for sending logs to Stackdriver Logging. You can do this either by selecting the **Enable Stackdriver Logging** checkbox in the create cluster dialogue in [GKE](https://cloud.google.com/container-engine/), or by setting the `KUBE_LOGGING_DESTINATION` flag to `gcp` when manually starting a cluster using `kube-up.sh`. From dccb59fddd9a9e74b90db24ffb03013e754f56ed Mon Sep 17 00:00:00 2001 From: Sahdev Zala Date: Tue, 21 Mar 2017 22:20:57 -0400 Subject: [PATCH 4/4] Fix incorrect sentence (#2876) * Fix incorrect sentence The changes removes an unnecessary word to correct doc sentence. * Fix incorrect sentence Remove an extra incorrect word from the sentence. --- .../cluster-administration/access-cluster.md | 2 +- docs/user-guide/accessing-the-cluster.md | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/concepts/cluster-administration/access-cluster.md b/docs/concepts/cluster-administration/access-cluster.md index d61e04fa56..27942f2175 100644 --- a/docs/concepts/cluster-administration/access-cluster.md +++ b/docs/concepts/cluster-administration/access-cluster.md @@ -14,7 +14,7 @@ Kubernetes CLI, `kubectl`. To access a cluster, you need to know the location of the cluster and have credentials to access it. Typically, this is automatically set-up when you work through -though a [Getting started guide](/docs/getting-started-guides/), +a [Getting started guide](/docs/getting-started-guides/), or someone else setup the cluster and provided you with credentials and a location. Check the location and credentials that kubectl knows about with this command: diff --git a/docs/user-guide/accessing-the-cluster.md b/docs/user-guide/accessing-the-cluster.md index 10440383c9..53bcd7b926 100644 --- a/docs/user-guide/accessing-the-cluster.md +++ b/docs/user-guide/accessing-the-cluster.md @@ -1,10 +1,10 @@ ---- -assignees: -- lavalamp -- mikedanese -title: Accessing Clusters ---- - -{% include user-guide-content-moved.md %} - +--- +assignees: +- lavalamp +- mikedanese +title: Accessing Clusters +--- + +{% include user-guide-content-moved.md %} + [Accessing Clusters](/docs/concepts/cluster-administration/access-cluster/) \ No newline at end of file