Merge pull request #626 from wmorgan/patch-1

include Linkerd in the ingress controller catalog
kubernetes · Apr 19, 2017 · dcc0efc · dcc0efc
2 parents 94d256e + e7ed88e
commit dcc0efc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/catalog.md b/docs/catalog.md
@@ -4,4 +4,5 @@ This is a non-comprehensive list of existing ingress controllers.
 
 * [Dummy controller backend](/examples/custom-controller)
 * [HAProxy Ingress controller](https://github.com/jcmoraisjr/haproxy-ingress)
+* [Linkerd](https://linkerd.io/config/0.9.1/linkerd/index.html#ingress-identifier)
 * [traefik](https://docs.traefik.io/toml/#kubernetes-ingress-backend)