whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107 from ragnard/patch-1

Browse Source 
Fix broken link to ingress contrib tree
This commit is contained in:
johndmulhausen
2016-03-16 09:01:35 -07:00
parent 5d5b17b6af fd8584ce88
commit ff8f6f92a3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/user-guide/ingress.md
+2 -2
View File
@@ -43,7 +43,7 @@ Before you start using the Ingress resource, there are a few things you should u
* The Ingress is a beta resource, not available in any Kubernetes release prior to 1.1. * The Ingress is a beta resource, not available in any Kubernetes release prior to 1.1.
* You need an Ingress controller to satisfy an Ingress. Simply creating the resource will have no effect. * You need an Ingress controller to satisfy an Ingress. Simply creating the resource will have no effect.
* On GCE/GKE there should be a [L7 cluster addon](https://releases.k8s.io/{{page.githubbranch}}/cluster/addons/cluster-loadbalancing/glbc/README.md#prerequisites), on other platforms you either need to write your own or [deploy an existing controller](https://github.com/kubernetes/contrib/tree/master/Ingress) as a pod. * On GCE/GKE there should be a [L7 cluster addon](https://releases.k8s.io/{{page.githubbranch}}/cluster/addons/cluster-loadbalancing/glbc/README.md#prerequisites), on other platforms you either need to write your own or [deploy an existing controller](https://github.com/kubernetes/contrib/tree/master/ingress) as a pod.
* The resource currently does not support HTTPS, but will do so before it leaves beta. * The resource currently does not support HTTPS, but will do so before it leaves beta.
## The Ingress Resource ## The Ingress Resource
@@ -239,7 +239,7 @@ You can achieve the same by invoking `kubectl replace -f` on a modified Ingress
* Combining L4 and L7 Ingress * Combining L4 and L7 Ingress
* More Ingress controllers * More Ingress controllers
Please track the [L7 and Ingress proposal](https://github.com/kubernetes/kubernetes/pull/12827) for more details on the evolution of the resource, and the [Ingress sub-repository](https://github.com/kubernetes/contrib/tree/master/Ingress) for more details on the evolution of various Ingress controllers. Please track the [L7 and Ingress proposal](https://github.com/kubernetes/kubernetes/pull/12827) for more details on the evolution of the resource, and the [Ingress sub-repository](https://github.com/kubernetes/contrib/tree/master/ingress) for more details on the evolution of various Ingress controllers.
## Alternatives ## Alternatives