Skip to content

Commit

Permalink
Merge pull request #147 from G-Harmon/patch-1
Browse files Browse the repository at this point in the history
update: s_k/ingress-k/ingress-gce_ in annotations.md
  • Loading branch information
nicksardo authored Mar 13, 2018
2 parents 43838b1 + d2617d2 commit 332d4f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ There is no attempt to record implementation-specific annotations using other pr
Key:

* `nginx`: the `kubernetes/ingress` nginx controller
* `gce`: the `kubernetes/ingress` GCE controller
* `gce`: the `kubernetes/ingress-gce` GCE controller
* `traefik`: Traefik's built-in Ingress controller
* `haproxy`: Joao Morais' [HAProxy Ingress controller](https://github.com/jcmoraisjr/haproxy-ingress)
* `trafficserver`: Torchbox's [Apache Traffic Server controller plugin](https://github.com/torchbox/k8s-ts-ingress)
Expand Down

0 comments on commit 332d4f7

Please sign in to comment.