From 0c97396cdef432d78ef1eeda61fc28be238dfed7 Mon Sep 17 00:00:00 2001 From: panmaoxiang Date: Sun, 8 Jul 2018 23:41:47 +0800 Subject: [PATCH 1/3] Fix typo in example script (#9381) Variable reference should be $ETCDHOSTS, not $ETCDHOST --- .../docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md b/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md index 2183108df5add..c8915627ac2da 100644 --- a/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md +++ b/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md @@ -91,7 +91,7 @@ this example. peerCertSANs: - "${HOST}" extraArgs: - initial-cluster: infra0=https://${ETCDHOST[0]}:2380,infra1=https://${ETCDHOST[1]}:2380,infra2=https://${ETCDHOST[2]}:2380 + initial-cluster: infra0=https://${ETCDHOSTS[0]}:2380,infra1=https://${ETCDHOSTS[1]}:2380,infra2=https://${ETCDHOSTS[2]}:2380 initial-cluster-state: new name: ${NAME} listen-peer-urls: https://${HOST}:2380 From f6e02daf084000e3e75a6262183f8ff34344f7f9 Mon Sep 17 00:00:00 2001 From: panmaoxiang Date: Sun, 8 Jul 2018 23:51:14 +0800 Subject: [PATCH 2/3] fix html --- .../configuration/manage-compute-resources-container.md | 7 +++---- .../tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/content/en/docs/concepts/configuration/manage-compute-resources-container.md b/content/en/docs/concepts/configuration/manage-compute-resources-container.md index d6e03f0d28e62..beb5a6f23f6c5 100644 --- a/content/en/docs/concepts/configuration/manage-compute-resources-container.md +++ b/content/en/docs/concepts/configuration/manage-compute-resources-container.md @@ -296,14 +296,13 @@ Container in the Pod was terminated and restarted five times. You can call `kubectl get pod` with the `-o go-template=...` option to fetch the status of previously terminated Containers: -```shell{% raw %} +```shell [13:59:01] $ kubectl get pod -o go-template='{{range.status.containerStatuses}}{{"Container Name: "}}{{.name}}{{"\r\nLastState: "}}{{.lastState}}{{end}}' simmemleak-hra99 Container Name: simmemleak -LastState: map[terminated:map[exitCode:137 reason:OOM Killed startedAt:2015-07-07T20:58:43Z finishedAt:2015-07-07T20:58:43Z containerID:docker://0e4095bba1feccdfe7ef9fb6ebffe972b4b14285d5acdec6f0d3ae8a22fad8b2]]{% endraw %} +LastState: map[terminated:map[exitCode:137 reason:OOM Killed startedAt:2015-07-07T20:58:43Z finishedAt:2015-07-07T20:58:43Z containerID:docker://0e4095bba1feccdfe7ef9fb6ebffe972b4b14285d5acdec6f0d3ae8a22fad8b2]] ``` -You can see that the Container was terminated because of `reason:OOM Killed`, -where `OOM` stands for Out Of Memory. +You can see that the Container was terminated because of `reason:OOM Killed`,where `OOM` stands for Out Of Memory. ## Local ephemeral storage {{< feature-state state="beta" >}} diff --git a/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md b/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md index c8915627ac2da..2183108df5add 100644 --- a/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md +++ b/content/en/docs/tasks/administer-cluster/setup-ha-etcd-with-kubeadm.md @@ -91,7 +91,7 @@ this example. peerCertSANs: - "${HOST}" extraArgs: - initial-cluster: infra0=https://${ETCDHOSTS[0]}:2380,infra1=https://${ETCDHOSTS[1]}:2380,infra2=https://${ETCDHOSTS[2]}:2380 + initial-cluster: infra0=https://${ETCDHOST[0]}:2380,infra1=https://${ETCDHOST[1]}:2380,infra2=https://${ETCDHOST[2]}:2380 initial-cluster-state: new name: ${NAME} listen-peer-urls: https://${HOST}:2380 From 52a45906719a5ead3d4e1e843692f9b3f98bbbb4 Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Wed, 18 Jul 2018 16:44:52 -0700 Subject: [PATCH 3/3] add a space --- .../configuration/manage-compute-resources-container.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/configuration/manage-compute-resources-container.md b/content/en/docs/concepts/configuration/manage-compute-resources-container.md index beb5a6f23f6c5..442b5e2ab00e9 100644 --- a/content/en/docs/concepts/configuration/manage-compute-resources-container.md +++ b/content/en/docs/concepts/configuration/manage-compute-resources-container.md @@ -302,7 +302,7 @@ Container Name: simmemleak LastState: map[terminated:map[exitCode:137 reason:OOM Killed startedAt:2015-07-07T20:58:43Z finishedAt:2015-07-07T20:58:43Z containerID:docker://0e4095bba1feccdfe7ef9fb6ebffe972b4b14285d5acdec6f0d3ae8a22fad8b2]] ``` -You can see that the Container was terminated because of `reason:OOM Killed`,where `OOM` stands for Out Of Memory. +You can see that the Container was terminated because of `reason:OOM Killed`, where `OOM` stands for Out Of Memory. ## Local ephemeral storage {{< feature-state state="beta" >}}