Skip to content

Commit

Permalink
Merge pull request #3672 from BenTheElder/ingress-cleanup
Browse files Browse the repository at this point in the history
simplify ingress guide, add Gateway API note
  • Loading branch information
k8s-ci-robot authored Jun 27, 2024
2 parents 72ed9ce + 057058f commit efd8c7c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 105 deletions.
39 changes: 6 additions & 33 deletions site/content/docs/user/ingress.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ by the ingress controller `nodeSelector`.


1. [Create a cluster](#create-cluster)
2. Deploy an Ingress controller, the following ingress controllers are known to work:
- [Contour](#contour)
- [Ingress Kong](#ingress-kong)
- [Ingress NGINX](#ingress-nginx)
2. Deploy an Ingress controller, we document [Ingress NGINX](#ingress-nginx) here but other ingresses may work including [Contour](https://projectcontour.io/docs/main/guides/kind/) and Kong, you should follow their docs if you choose to use them.

> **NOTE**: You may also want to consider using [Gateway API](https://gateway-api.sigs.k8s.io/) instead of Ingress.
> Gateway API has an [Ingress migration guide](ttps://gateway-api.sigs.k8s.io/guides/migrating-from-ingress/).
>
> You can use blixit to test Gateway API with kind https://github.com/kubernetes-sigs/blixt#usage
### Create Cluster

Expand Down Expand Up @@ -54,35 +56,6 @@ nodes:
EOF
{{< /codeFromInline >}}

### Contour

Deploy [Contour components](https://projectcontour.io/quickstart/contour.yaml).

{{< codeFromInline lang="bash" >}}
kubectl apply -f https://projectcontour.io/quickstart/contour.yaml
{{< /codeFromInline >}}

Apply kind specific patches to forward the hostPorts to the
ingress controller, set taint tolerations and
schedule it to the custom labelled node.

```json
{{% readFile "static/examples/ingress/contour/patch.json" %}}
```

Apply it by running:

{{< codeFromInline lang="bash" >}}
kubectl patch daemonsets -n projectcontour envoy -p '{{< minify file="static/examples/ingress/contour/patch.json" >}}'
{{< /codeFromInline >}}

Now Contour is ready to be used.
Refer to Contour's [Getting Started](https://projectcontour.io/getting-started/#test-it-out) documentation for a basic usage example.

Note, the example in [Using Ingress](#using-ingress) will not work with Contour because it uses nginx-specific annotations on the Ingress resource.

Additional information about Contour can be found at: [projectcontour.io](https://projectcontour.io)

### Ingress NGINX

{{< codeFromInline lang="bash" >}}
Expand Down
23 changes: 0 additions & 23 deletions site/static/examples/ingress/contour/patch.json

This file was deleted.

44 changes: 0 additions & 44 deletions site/static/examples/ingress/kong/deployment.patch.json

This file was deleted.

5 changes: 0 additions & 5 deletions site/static/examples/ingress/kong/service.patch.json

This file was deleted.

0 comments on commit efd8c7c

Please sign in to comment.