diff --git a/.travis.yml b/.travis.yml index 791d289e88..e527e16dbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,10 @@ install: - cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/ - rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/* - cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/ +- go get -v k8s.io/kubernetes/cmd/mungedocs script: - go test -v k8s.io/kubernetes.github.io/test - $GOPATH/bin/md-check --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io - ./verify-docs-format.sh +- $GOPATH/bin/mungedocs --verbose --verify --upstream=origin --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io/docs/ --repo-root=$HOME/gopath/src/k8s.io/kubernetes.github.io --skip-munges=remove-whitespace,blank-lines-surround-preformatted,header-lines,sync-examples,analytics,analytics,kubectl-dash-f,table-of-contents,md-links,kubectl-dash-f diff --git a/docs/admin/authorization.md b/docs/admin/authorization.md index 526f07a8db..45affd5d15 100644 --- a/docs/admin/authorization.md +++ b/docs/admin/authorization.md @@ -115,10 +115,10 @@ The tuple of attributes is checked for a match against every policy in the policy file. If at least one line matches the request attributes, then the request is authorized (but may fail later validation). -To permit any authenticated user to do something, write a policy with the +To permit any authenticated user to do something, write a policy with the group property set to `"system:authenticated"`. -To permit any unauthenticated user to do something, write a policy with the +To permit any unauthenticated user to do something, write a policy with the group property set to `"system:unauthenticated"`. To permit a user to do anything, write a policy with the apiGroup, namespace, @@ -465,6 +465,7 @@ subjects: name: system:authenticated - kind: Group name: system:unauthenticated +``` ## Webhook Mode diff --git a/docs/user-guide/kubectl/kubectl_get.md b/docs/user-guide/kubectl/kubectl_get.md index 7e973d7bc9..ac8817cf78 100644 --- a/docs/user-guide/kubectl/kubectl_get.md +++ b/docs/user-guide/kubectl/kubectl_get.md @@ -76,7 +76,8 @@ kubectl get [(-o|--output=)json|yaml|wide|custom-columns=...|custom-columns-file # List one or more resources by their type and names. kubectl get rc/web service/frontend pods/web-pod-13je7 -{% endraw %}``` +{% endraw %} +``` ### Options diff --git a/docs/user-guide/pods/init-container.md b/docs/user-guide/pods/init-container.md index ab743f2fd8..ce7679d40e 100644 --- a/docs/user-guide/pods/init-container.md +++ b/docs/user-guide/pods/init-container.md @@ -20,7 +20,7 @@ the next one is started. If the init container fails, Kubernetes will restart the pod until the init container succeeds. If a pod is marked as `RestartNever`, the pod will fail if the init container fails. -You specify a container as an init container by adding an annotation. +You specify a container as an init container by adding an annotation. The annotation key is `pod.beta.kubernetes.io/init-containers`. The annotation value is a JSON array of [objects of type `v1.Container` ](http://kubernetes.io/docs/api-reference/v1/definitions/#_v1_container) @@ -62,7 +62,7 @@ not able to access. Since init containers run to completion before any app containers start, and since app containers run in parallel, they provide an easier way to block or -delay the startup of application containers until some precondition is met. +delay the startup of application containers until some precondition is met. Because init containers run in sequence and there can be multiple init containers, they can be composed easily. @@ -77,7 +77,6 @@ Here are some ideas for how to use init containers: - Clone a git repository into a volume - Place values like a POD_IP into a configuration file, and run a template tool (e.g. jinja) to generate a configuration file to be consumed by the main app contianer. -``` Complete usage examples can be found in the [StatefulSets documentation](/docs/concepts/abstractions/controllers/statefulsets/) and the [Production Pods