From 7ded7d1b0b00104ccb80929e5959e44541c42f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 09:32:44 +0800 Subject: [PATCH 1/5] static-pod example bad format in the final page --- docs/tasks/administer-cluster/static-pod.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tasks/administer-cluster/static-pod.md b/docs/tasks/administer-cluster/static-pod.md index 8dd0e48644e41..b5e70c64ad997 100644 --- a/docs/tasks/administer-cluster/static-pod.md +++ b/docs/tasks/administer-cluster/static-pod.md @@ -29,7 +29,7 @@ For example, this is how to start a simple web server as a static pod: 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`: - ``` + ~~~ [root@my-node1 ~] $ mkdir /etc/kubelet.d/ [root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml apiVersion: v1 @@ -47,7 +47,7 @@ For example, this is how to start a simple web server as a static pod: containerPort: 80 protocol: TCP EOF - ``` + ~~~ 3. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument. On Fedora edit `/etc/kubernetes/kubelet` to include this line: From 7b5228d4656f260e98ba64c43064d108d0f52d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 09:37:23 +0800 Subject: [PATCH 2/5] static-pod example bad format in the final page --- docs/tasks/administer-cluster/static-pod.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/tasks/administer-cluster/static-pod.md b/docs/tasks/administer-cluster/static-pod.md index b5e70c64ad997..747a6185399ec 100644 --- a/docs/tasks/administer-cluster/static-pod.md +++ b/docs/tasks/administer-cluster/static-pod.md @@ -29,7 +29,6 @@ For example, this is how to start a simple web server as a static pod: 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`: - ~~~ [root@my-node1 ~] $ mkdir /etc/kubelet.d/ [root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml apiVersion: v1 @@ -47,7 +46,6 @@ For example, this is how to start a simple web server as a static pod: containerPort: 80 protocol: TCP EOF - ~~~ 3. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument. On Fedora edit `/etc/kubernetes/kubelet` to include this line: From 6ee67bd3c31e447cc59492fb19983683707519c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 09:41:51 +0800 Subject: [PATCH 3/5] static-pod example bad format in the final page --- docs/tasks/administer-cluster/static-pod.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tasks/administer-cluster/static-pod.md b/docs/tasks/administer-cluster/static-pod.md index 747a6185399ec..a329f0946699a 100644 --- a/docs/tasks/administer-cluster/static-pod.md +++ b/docs/tasks/administer-cluster/static-pod.md @@ -29,6 +29,7 @@ For example, this is how to start a simple web server as a static pod: 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`: + ```shell [root@my-node1 ~] $ mkdir /etc/kubelet.d/ [root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml apiVersion: v1 @@ -46,6 +47,7 @@ For example, this is how to start a simple web server as a static pod: containerPort: 80 protocol: TCP EOF + ``` 3. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument. On Fedora edit `/etc/kubernetes/kubelet` to include this line: From 1c0ff894d40a1185d9cf72deea23f0c1b1ba1d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 09:55:50 +0800 Subject: [PATCH 4/5] static-pod example bad format in the final page --- docs/tasks/administer-cluster/static-pod.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tasks/administer-cluster/static-pod.md b/docs/tasks/administer-cluster/static-pod.md index a329f0946699a..d975f9e0f2110 100644 --- a/docs/tasks/administer-cluster/static-pod.md +++ b/docs/tasks/administer-cluster/static-pod.md @@ -30,6 +30,7 @@ For example, this is how to start a simple web server as a static pod: 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`: ```shell + [root@my-node1 ~] $ mkdir /etc/kubelet.d/ [root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml apiVersion: v1 From b6223c665d3182e6826476e3bbd569bf1ff10c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=8F?= Date: Thu, 26 Oct 2017 10:15:09 +0800 Subject: [PATCH 5/5] static-pod example bad format in the final page --- docs/tasks/administer-cluster/static-pod.md | 37 ++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/tasks/administer-cluster/static-pod.md b/docs/tasks/administer-cluster/static-pod.md index d975f9e0f2110..022d6093f81c3 100644 --- a/docs/tasks/administer-cluster/static-pod.md +++ b/docs/tasks/administer-cluster/static-pod.md @@ -29,26 +29,25 @@ For example, this is how to start a simple web server as a static pod: 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubelet.d/static-web.yaml`: - ```shell - - [root@my-node1 ~] $ mkdir /etc/kubelet.d/ - [root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml - apiVersion: v1 - kind: Pod - metadata: - name: static-web - labels: - role: myrole - spec: - containers: +```shell +[root@my-node1 ~] $ mkdir /etc/kubelet.d/ +[root@my-node1 ~] $ cat </etc/kubelet.d/static-web.yaml +apiVersion: v1 +kind: Pod +metadata: + name: static-web + labels: + role: myrole +spec: + containers: + - name: web + image: nginx + ports: - name: web - image: nginx - ports: - - name: web - containerPort: 80 - protocol: TCP - EOF - ``` + containerPort: 80 + protocol: TCP +EOF +``` 3. Configure your kubelet daemon on the node to use this directory by running it with `--pod-manifest-path=/etc/kubelet.d/` argument. On Fedora edit `/etc/kubernetes/kubelet` to include this line: