Skip to content

Commit fdf9e3c

Browse files
committed
reintroduce separate CRD files for contour and gateway-api
Signed-off-by: Dave van Duivenbode <d.duivenbode@buckaroo.nl>
1 parent e74dcfa commit fdf9e3c

File tree

5 files changed

+26226
-19
lines changed

5 files changed

+26226
-19
lines changed

charts/contour/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22
## 0.3.0
3-
* Move Contour and Gateway API CRDs into new `contour-crds` chart; CRDs are no longer installed by the `contour` chart by default.
3+
* Contour and Gateway API CRDs installation disabled by default (`manageCRDs: false`)
44

55
## 0.2.0
66
* Contour upgraded to 1.33.0

charts/contour/README.md

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,8 @@ These commands deploy contour on the Kubernetes cluster in the default configura
2929

3030
> **Tip**: List all releases using `helm list` or `helm ls --all-namespaces`
3131
32-
## Installing CRDs
33-
34-
Contour and Gateway API CRDs are shipped in the separate `contour-crds` chart and should be installed once per cluster before installing or upgrading the main `contour` chart.
35-
36-
```console
37-
helm install contour-crds contour/contour-crds
38-
```
39-
40-
The `contour` chart no longer manages CRDs directly, allowing multiple Contour deployments without reapplying cluster-scoped resources.
41-
4232
## Configuration and installation details
4333

44-
## Developing and testing locally
45-
46-
- Lint both charts from the repo root: `helm lint charts/contour-crds charts/contour`.
47-
- Install CRDs once into a dev cluster (namespace is arbitrary for CRDs): `helm install contour-crds ./charts/contour-crds --namespace contour-system --create-namespace`.
48-
- Install or upgrade the main chart for a test release: `helm upgrade --install contour ./charts/contour --namespace projectcontour --create-namespace`.
49-
- Render templates without touching a cluster: `helm template contour ./charts/contour -f my-values.yaml`.
50-
- When cleaning up, `helm uninstall contour` (leave `contour-crds` in place if other Contour installs exist).
51-
5234
### Resource requests and limits
5335

5436
The chart allows setting resource requests and limits for all containers inside the chart deployment. These are defined in the `resources` value (see the parameters table). Setting requests is essential for production workloads and these should be adapted to your specific use case.
@@ -236,6 +218,7 @@ To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.
236218
| `contour.extraArgs` | Extra arguments passed to Contour container | `[]` |
237219
| `contour.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if contour.resources is set (contour.resources is recommended for production). | `nano` |
238220
| `contour.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` |
221+
| `contour.manageCRDs` | Manage the creation, upgrade and deletion of Contour CRDs. | `false` |
239222
| `contour.envoyServiceNamespace` | Namespace of the envoy service to inspect for Ingress status details. | `""` |
240223
| `contour.envoyServiceName` | DEPRECATED: use envoy.service.name | `""` |
241224
| `contour.leaderElectionResourceName` | Name of the contour (Lease) leader election will lease. | `""` |
@@ -548,6 +531,7 @@ To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.
548531

549532
| Name | Description | Value |
550533
| ----------------------- | -------------------------------------------------------------- | ------- |
534+
| `gatewayAPI.manageCRDs` | Manage the creation, upgrade and deletion of Gateway API CRDs. | `false` |
551535

552536
### Metrics parameters
553537

0 commit comments

Comments
 (0)