Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.8

* 'master' of https://github.com/kubernetes/kubernetes.github.io: ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14 ZTE-SH-CN-define-command-argument-container (#5381) Update index.md Update Kompose docs Improve host aliases page (#5443) Add link to AlwaysPullImages admission controller Revert "create homepage for user journeys" create homepage for user journeys fix the command output ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363) Add a note to static pod manifest scanning revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461) Fix pod probes yaml file Redirect v1 docs. (#5460) Fix error link (#5459) Fix typo in deployment documentation # Conflicts: # docs/tutorials/stateful-application/basic-stateful-set.md
2017-09-15 17:19:32 -07:00
parent 5b9b63454b 82ac9251fd
commit a60b2d3045
19 changed files with 833 additions and 254 deletions
@@ -17,6 +17,7 @@ Static pod can be created in two ways: either by using configuration file(s) or
 ### Configuration files

 The configuration files are just standard pod definition in json or yaml format in specific directory. Use `kubelet --pod-manifest-path=<the directory>` to start kubelet daemon, which periodically scans the directory and creates/deletes static pods as yaml/json files appear/disappear there.
+Note that kubelet will ignore files starting with dots when scanning the specified directory.

 For example, this is how to start a simple web server as a static pod:

@@ -65,7 +65,7 @@ kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/exec-livenes

 Within 30 seconds, view the Pod events:

-```
+```shell
 kubectl describe pod liveness-exec
 ```

@@ -1,22 +1,17 @@
 apiVersion: v1
 kind: Pod
-
 metadata:
  labels:
    test: liveness
  name: liveness-exec
 spec:
  containers:
-
  - name: liveness
-
+    image: gcr.io/google_containers/busybox
    args:
    - /bin/sh
    - -c
    - touch /tmp/healthy; sleep 30; rm -rf /tmp/healthy; sleep 600
-
-    image: gcr.io/google_containers/busybox
-
    livenessProbe:
      exec:
        command:
@@ -6,14 +6,10 @@ metadata:
  name: liveness-http
 spec:
  containers:
-
  - name: liveness
-
+    image: gcr.io/google_containers/liveness
    args:
    - /server
-
-    image: gcr.io/google_containers/liveness
-
    livenessProbe:
      httpGet:
        path: /healthz