From 068c797f47f346a578148964926bba32a884f4fa Mon Sep 17 00:00:00 2001 From: caiyixiang Date: Tue, 10 Jan 2017 09:20:38 +0800 Subject: [PATCH 1/4] Update ingress.md --- docs/user-guide/ingress.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index b9c371e2a1..788cabaa4b 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -69,7 +69,7 @@ spec: *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).* -__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](/docs/user-guide/simple-yaml), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). +__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](docs/user-guide/deploying-applications), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). __Lines 5-7__: Ingress [spec](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/api-conventions.md#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules. @@ -107,7 +107,7 @@ Where `107.178.254.228` is the IP allocated by the Ingress controller to satisfy ### Simple fanout -As described previously, pods within kubernetes have IPs only visible on the cluster network, so we need something at the edge accepting ingress traffic and proxying it to the right endpoints. This component is usually a highly available loadbalancer/s. An Ingress allows you to keep the number of loadbalancers down to a minimum, for example, a setup like: +As described previously, pods within kubernetes have IPs only visible on the cluster network, so we need something at the edge accepting ingress traffic and proxying it to the right endpoints. This component is usually a highly available loadbalancers. An Ingress allows you to keep the number of loadbalancers down to a minimum, for example, a setup like: ```shell foo.bar.com -> 178.91.123.132 -> / foo s1:80 From b9c0d80bbc94edf08dce29929b958c58243a3aa2 Mon Sep 17 00:00:00 2001 From: caiyixiang Date: Sat, 14 Jan 2017 15:07:09 +0800 Subject: [PATCH 2/4] Update ingress.md --- docs/user-guide/ingress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index 788cabaa4b..f27788ccf9 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -107,7 +107,7 @@ Where `107.178.254.228` is the IP allocated by the Ingress controller to satisfy ### Simple fanout -As described previously, pods within kubernetes have IPs only visible on the cluster network, so we need something at the edge accepting ingress traffic and proxying it to the right endpoints. This component is usually a highly available loadbalancers. An Ingress allows you to keep the number of loadbalancers down to a minimum, for example, a setup like: +As described previously, pods within kubernetes have IPs only visible on the cluster network, so we need something at the edge accepting ingress traffic and proxying it to the right endpoints. This component is usually a highly available loadbalancer. An Ingress allows you to keep the number of loadbalancers down to a minimum, for example, a setup like: ```shell foo.bar.com -> 178.91.123.132 -> / foo s1:80 From 4bd2d4ce8ef266b2eebf6060e837785dd07e618a Mon Sep 17 00:00:00 2001 From: caiyixiang Date: Wed, 18 Jan 2017 08:33:28 +0800 Subject: [PATCH 3/4] Update ingress.md --- docs/user-guide/ingress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index f27788ccf9..9768044bc9 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -69,7 +69,7 @@ spec: *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).* -__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](docs/user-guide/deploying-applications), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). +__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](/docs/user-guide/deploying-applications), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). __Lines 5-7__: Ingress [spec](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/api-conventions.md#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules. From f86d09dab3d0e46c27b2c2b7ddede3fb4713bcff Mon Sep 17 00:00:00 2001 From: Peter Lee Date: Wed, 18 Jan 2017 12:57:01 +0800 Subject: [PATCH 4/4] fix broken link --- docs/getting-started-guides/dcos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/dcos.md b/docs/getting-started-guides/dcos.md index d99f2d332e..5479ec10b9 100644 --- a/docs/getting-started-guides/dcos.md +++ b/docs/getting-started-guides/dcos.md @@ -32,7 +32,7 @@ Explore the following resources for more information about Kubernetes, Kubernete - [DCOS Documentation](https://docs.mesosphere.com/) - [Managing DCOS Services](https://docs.mesosphere.com/services/kubernetes/) - [Kubernetes Examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) -- [Kubernetes on Mesos Documentation](https://releases.k8s.io/{{page.githubbranch}}/contrib/mesos/README.md) +- [Kubernetes on Mesos Documentation](https://github.com/kubernetes-incubator/kube-mesos-framework/blob/master/README.md) - [Kubernetes on Mesos Release Notes](https://github.com/mesosphere/kubernetes-mesos/releases) - [Kubernetes on DCOS Package Source](https://github.com/mesosphere/kubernetes-mesos)