From 115d3cde97ee794bbb7fc073160b17b75df88b31 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Fri, 28 Oct 2016 00:43:49 -0400 Subject: [PATCH 1/4] Fix path in reference.yml --- _data/reference.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/reference.yml b/_data/reference.yml index 5d4fe17f7b..62fdb0ca92 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -219,7 +219,7 @@ toc: - title: Replication Controller path: /docs/user-guide/replication-controller/ - title: Resource Quotas - path: /docs/admin/resource-quota/ + path: /docs/admin/resourcequota/ - title: Scheduled Jobs path: /docs/user-guide/scheduled-jobs/ - title: Secrets @@ -269,6 +269,6 @@ toc: - title: Federation Components section: - title: federation-apiserver - path: /docs/admin/federation-apiserver.md + path: /docs/admin/federation-apiserver - title : federation-controller-mananger - path: /docs/admin/federation-controller-manager.md + path: /docs/admin/federation-controller-manager From e34352c152198620da8d135ef5b8aaf19e7dd7ce Mon Sep 17 00:00:00 2001 From: Julien Vey Date: Fri, 28 Oct 2016 10:39:51 +0200 Subject: [PATCH 2/4] Remove line numbers in ingress resource snippet * To be consistent with the rest of the guide. * To simplify copy/paste of the example. --- docs/user-guide/ingress.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index 6ce1eb915d..a8324bea24 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -53,18 +53,18 @@ Make sure you review the [beta limitations](https://github.com/kubernetes/contri A minimal Ingress might look like: ```yaml -01. apiVersion: extensions/v1beta1 -02. kind: Ingress -03. metadata: -04. name: test-ingress -05. spec: -06. rules: -07. - http: -08. paths: -09. - path: /testpath -10. backend: -11. serviceName: test -12. servicePort: 80 +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: test-ingress +spec: + rules: + - http: + paths: + - path: /testpath + backend: + serviceName: test + servicePort: 80 ``` *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).* From 64ca647721ffe54b5375412bc17c6c349b4460ad Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Mon, 14 Nov 2016 15:02:42 -0800 Subject: [PATCH 3/4] Fix broken kubectl link --- docs/user-guide/production-pods.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/production-pods.md b/docs/user-guide/production-pods.md index 440ac4619a..240aec4e8f 100644 --- a/docs/user-guide/production-pods.md +++ b/docs/user-guide/production-pods.md @@ -218,7 +218,7 @@ The specification of a pre-stop hook is similar to that of probes, but without t ## Termination message -In order to achieve a reasonably high level of availability, especially for actively developed applications, it's important to debug failures quickly. Kubernetes can speed debugging by surfacing causes of fatal errors in a way that can be display using [`kubectl`](/docs/user-guide/kubectl/kubectl) or the [UI](/docs/user-guide/ui), in addition to general [log collection](/docs/user-guide/logging). It is possible to specify a `terminationMessagePath` where a container will write its 'death rattle'?, such as assertion failure messages, stack traces, exceptions, and so on. The default path is `/dev/termination-log`. +In order to achieve a reasonably high level of availability, especially for actively developed applications, it's important to debug failures quickly. Kubernetes can speed debugging by surfacing causes of fatal errors in a way that can be display using [`kubectl`](/docs/user-guide/kubectl/) or the [UI](/docs/user-guide/ui), in addition to general [log collection](/docs/user-guide/logging). It is possible to specify a `terminationMessagePath` where a container will write its 'death rattle'?, such as assertion failure messages, stack traces, exceptions, and so on. The default path is `/dev/termination-log`. Here is a toy example: From 3797f7015fee880e5829dbd140079bdd2942bb69 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 21 Nov 2016 13:29:52 -0800 Subject: [PATCH 4/4] Update Weave Link --- docs/admin/addons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/addons.md b/docs/admin/addons.md index 192b0c86a8..1555f8263c 100644 --- a/docs/admin/addons.md +++ b/docs/admin/addons.md @@ -15,7 +15,7 @@ Add-ons in each section are sorted alphabetically - the ordering does not imply * [Canal](https://github.com/tigera/canal/tree/master/k8s-install/kubeadm) unites Flannel and Calico, providing networking and network policy. * [Flannel](https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml) is a overlay network provider that can be used with Kubernetes. * [Romana](http://romana.io) is a Layer 3 networking solution for pod networks that also supports the [NetworkPolicy API](/docs/user-guide/networkpolicies/). Kubeadm add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize). -* [Weave Net](https://github.com/weaveworks/weave-kube) provides networking and network policy, will carry on working on both sides of a network partition, and does not require an external database. +* [Weave Net](https://www.weave.works/docs/net/latest/kube-addon/) provides networking and network policy, will carry on working on both sides of a network partition, and does not require an external database. ## Visualization & Control