From a0cecd07cb5fa2ab1ddbc458bb0d1fc1e41bbf4a Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Mon, 12 Sep 2016 11:11:38 -0700 Subject: [PATCH] GCE runs the l7 cluster addon on the master --- docs/user-guide/ingress.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/user-guide/ingress.md b/docs/user-guide/ingress.md index d80efa9bb9..1c82fb3676 100644 --- a/docs/user-guide/ingress.md +++ b/docs/user-guide/ingress.md @@ -44,13 +44,7 @@ It can be configured to give services externally-reachable urls, load balance tr Before you start using the Ingress resource, there are a few things you should understand. 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. -On GCE/GKE there should be a [L7 cluster addon](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/gce/README.md), deployed into the `kube-system` namespace: - -```shell -$ kubectl get pods --namespace=kube-system -l k8s-app=glbc -NAME READY STATUS RESTARTS AGE -l7-lb-controller-v0.6.0-chnan 2/2 Running 0 1d -``` +GCE/GKE deploys an ingress controller on the master. You can deploy any number of custom ingress controllers in a pod. You must annotate each ingress with the appropriate class, as indicated [here](https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx#running-multiple-ingress-controllers) and [here](https://github.com/kubernetes/contrib/blob/master/ingress/controllers/gce/BETA_LIMITATIONS.md#disabling-glbc). Make sure you review the [beta limitations](https://github.com/kubernetes/contrib/tree/master/ingress/controllers/gce/BETA_LIMITATIONS.md) of this controller. In environments other than GCE/GKE, you need to [deploy a controller](https://github.com/kubernetes/contrib/tree/master/ingress/controllers) as a pod.