Skip to content

Commit c7972d2

Browse files
authored
Merge branch 'main' into update-dev-doc
2 parents 6eb8bc1 + 78be712 commit c7972d2

File tree

4 files changed

+98
-27
lines changed

4 files changed

+98
-27
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and `UDPRoute` -- to configure an HTTP or TCP/UDP load balancer, reverse-proxy,
1010
on Kubernetes. NGINX Gateway Fabric supports a subset of the Gateway API.
1111

1212
For a list of supported Gateway API resources and features, see
13-
the [Gateway API Compatibility](https://docs.nginx.com/nginx-gateway-fabric/gateway-api-compatibility/) doc.
13+
the [Gateway API Compatibility](https://docs.nginx.com/nginx-gateway-fabric/overview/gateway-api-compatibility/) doc.
1414

1515
Learn about our [design principles](/docs/developer/design-principles.md) and [architecture](https://docs.nginx.com/nginx-gateway-fabric/overview/gateway-architecture/).
1616

deploy/helm-chart/README.md

+49-14
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,22 @@ If you are installing the edge version of NGINX Gateway Fabric:
6666

6767
### Installing the Chart from the OCI Registry
6868

69-
To install the chart with the release name `my-release` (`my-release` is the name that you choose) into the
70-
nginx-gateway namespace (with optional `--create-namespace` flag - you can omit if the namespace already exists):
69+
To install the latest stable release of NGINX Gateway Fabric in the `nginx-gateway` namespace, run the following command:
7170

7271
```shell
73-
helm install my-release oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace --wait -n nginx-gateway
72+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway
7473
```
7574

76-
This will install the latest stable release. To install the latest version from the `main` branch, specify the
77-
`--version 0.0.0-edge` flag when installing.
75+
`ngf` is the name of the release, and can be changed to any name you want. This name is added as a prefix to the Deployment name.
76+
77+
If the namespace already exists, you can omit the optional `--create-namespace` flag. If you want the latest version from the `main` branch, add `--version 0.0.0-edge` to your install command.
78+
79+
To wait for the Deployment to be ready, you can either add the `--wait` flag to the `helm install` command, or run
80+
the following after installing:
81+
82+
```shell
83+
kubectl wait --timeout=5m -n nginx-gateway deployment/ngf-nginx-gateway-fabric --for=condition=Available
84+
```
7885

7986
### Installing the Chart via Sources
8087

@@ -90,11 +97,39 @@ This will pull the latest stable release. To pull the latest version from the `m
9097

9198
#### Installing the Chart
9299

93-
To install the chart with the release name `my-release` (`my-release` is the name that you choose) into the
94-
nginx-gateway namespace (with optional `--create-namespace` flag - you can omit if the namespace already exists):
100+
To install the chart into the `nginx-gateway` namespace, run the following command.
101+
102+
```shell
103+
helm install ngf . --create-namespace -n nginx-gateway
104+
```
105+
106+
`ngf` is the name of the release, and can be changed to any name you want. This name is added as a prefix to the Deployment name.
107+
108+
If the namespace already exists, you can omit the optional `--create-namespace` flag.
109+
110+
To wait for the Deployment to be ready, you can either add the `--wait` flag to the `helm install` command, or run
111+
the following after installing:
112+
113+
```shell
114+
kubectl wait --timeout=5m -n nginx-gateway deployment/ngf-nginx-gateway-fabric --for=condition=Available
115+
```
116+
117+
### Custom installation options
118+
119+
#### Service type
120+
121+
By default, the NGINX Gateway Fabric helm chart deploys a LoadBalancer Service.
122+
123+
To use a NodePort Service instead:
124+
125+
```shell
126+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway --set service.type=NodePort
127+
```
128+
129+
To disable the creation of a Service:
95130

96131
```shell
97-
helm install my-release . --create-namespace --wait -n nginx-gateway
132+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway --set service.create=false
98133
```
99134

100135
## Upgrading the Chart
@@ -145,10 +180,10 @@ Warning: kubectl apply should be used on resource created by either kubectl crea
145180

146181
### Upgrading the Chart from the OCI Registry
147182

148-
To upgrade the release `my-release`, run:
183+
To upgrade the release `ngf`, run:
149184

150185
```shell
151-
helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric -n nginx-gateway
186+
helm upgrade ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric -n nginx-gateway
152187
```
153188

154189
This will upgrade to the latest stable release. To upgrade to the latest version from the `main` branch, specify
@@ -157,10 +192,10 @@ the `--version 0.0.0-edge` flag when upgrading.
157192
### Upgrading the Chart from the Sources
158193

159194
Pull the chart sources as described in [Pulling the Chart](#pulling-the-chart), if not already present. Then, to upgrade
160-
the release `my-release`, run:
195+
the release `ngf`, run:
161196

162197
```shell
163-
helm upgrade my-release . -n nginx-gateway
198+
helm upgrade ngf . -n nginx-gateway
164199
```
165200

166201
### Configure Delayed Termination for Zero Downtime Upgrades
@@ -216,10 +251,10 @@ being performed on NGF), you may need to configure delayed termination on the NG
216251

217252
## Uninstalling the Chart
218253

219-
To uninstall/delete the release `my-release`:
254+
To uninstall/delete the release `ngf`:
220255

221256
```shell
222-
helm uninstall my-release -n nginx-gateway
257+
helm uninstall ngf -n nginx-gateway
223258
kubectl delete ns nginx-gateway
224259
kubectl delete crd nginxgateways.gateway.nginx.org
225260
```

site/content/installation/installing-ngf/helm.md

+44-10
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ To complete this guide, you'll need to install:
2727
- To install the latest stable release of NGINX Gateway Fabric in the **nginx-gateway** namespace, run the following command:
2828

2929
```shell
30-
helm install <my-release> oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace --wait -n nginx-gateway
30+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway
3131
```
3232

33-
Change `<my-release>` to the name you want for your release. If the namespace already exists, you can omit the optional `--create-namespace` flag. If you want the latest version from the **main** branch, add `--version 0.0.0-edge` to your install command.
33+
`ngf` is the name of the release, and can be changed to any name you want. This name is added as a prefix to the Deployment name.
34+
35+
If the namespace already exists, you can omit the optional `--create-namespace` flag. If you want the latest version from the **main** branch, add `--version 0.0.0-edge` to your install command.
36+
37+
To wait for the Deployment to be ready, you can either add the `--wait` flag to the `helm install` command, or run the following after installing:
38+
39+
```shell
40+
kubectl wait --timeout=5m -n nginx-gateway deployment/ngf-nginx-gateway-fabric --for=condition=Available
41+
```
3442

3543
### Install from sources {#install-from-sources}
3644

@@ -39,10 +47,36 @@ To complete this guide, you'll need to install:
3947
2. To install the chart into the **nginx-gateway** namespace, run the following command.
4048

4149
```shell
42-
helm install <my-release> . --create-namespace --wait -n nginx-gateway
50+
helm install ngf . --create-namespace -n nginx-gateway
4351
```
4452

45-
Change `<my-release>` to the name you want for your release. If the namespace already exists, you can omit the optional `--create-namespace` flag.
53+
`ngf` is the name of the release, and can be changed to any name you want. This name is added as a prefix to the Deployment name.
54+
55+
If the namespace already exists, you can omit the optional `--create-namespace` flag.
56+
57+
To wait for the Deployment to be ready, you can either add the `--wait` flag to the `helm install` command, or run the following after installing:
58+
59+
```shell
60+
kubectl wait --timeout=5m -n nginx-gateway deployment/ngf-nginx-gateway-fabric --for=condition=Available
61+
```
62+
63+
### Custom installation options
64+
65+
#### Service type
66+
67+
By default, the NGINX Gateway Fabric helm chart deploys a LoadBalancer Service.
68+
69+
To use a NodePort Service instead:
70+
71+
```shell
72+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway --set service.type=NodePort
73+
```
74+
75+
To disable the creation of a Service:
76+
77+
```shell
78+
helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway --set service.create=false
79+
```
4680

4781
## Upgrade NGINX Gateway Fabric
4882

@@ -89,10 +123,10 @@ To upgrade the CRDs, take the following steps:
89123
- To upgrade to the latest stable release of NGINX Gateway Fabric, run:
90124

91125
```shell
92-
helm upgrade <my-release> oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric -n nginx-gateway
126+
helm upgrade ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric -n nginx-gateway
93127
```
94128

95-
Replace `<my-release>` with your chosen release name.
129+
If needed, replace `ngf` with your chosen release name.
96130

97131
#### Upgrade from sources
98132

@@ -101,10 +135,10 @@ To upgrade the CRDs, take the following steps:
101135
1. To upgrade, run: the following command:
102136

103137
```shell
104-
helm upgrade <my-release> . -n nginx-gateway
138+
helm upgrade ngf . -n nginx-gateway
105139
```
106140

107-
Replace `<my-release>` with your chosen release name.
141+
If needed, replace `ngf` with your chosen release name.
108142

109143
## Delay pod termination for zero downtime upgrades {#configure-delayed-pod-termination-for-zero-downtime-upgrades}
110144

@@ -163,10 +197,10 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K
163197
- To uninstall NGINX Gateway Fabric, run:
164198

165199
```shell
166-
helm uninstall <my-release> -n nginx-gateway
200+
helm uninstall ngf -n nginx-gateway
167201
```
168202

169-
Replace `<my-release>` with your chosen release name.
203+
If needed, replace `ngf` with your chosen release name.
170204

171205
2. **Remove namespace and CRDs:**
172206

site/content/installation/running-on-kind.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ make create-kind-cluster
2525

2626
Follow the [installation](./how-to/installation/installation.md) instructions to deploy NGINX Gateway Fabric on your Kind cluster.
2727

28+
{{<note>}} For `kind` clusters, NodePort services require [extra configuration](https://kind.sigs.k8s.io/docs/user/configuration/#nodeport-with-port-mappings) and LoadBalancer services need [a third-party controller](https://kind.sigs.k8s.io/docs/user/loadbalancer/) like MetalLB for external IP assignment. However, the Helm chart creates a LoadBalancer service by default. To avoid this, you can disable service creation by adding `--set service.create=false` to your Helm command and use the port-forwarding command below instead to try out the examples. {{</note>}}
29+
2830
## Access NGINX Gateway Fabric
2931

3032
Forward local ports 8080 and 8443 to ports 80 and 443 of the nginx-gateway Pod:
@@ -33,8 +35,8 @@ Forward local ports 8080 and 8443 to ports 80 and 443 of the nginx-gateway Pod:
3335
kubectl -n nginx-gateway port-forward <pod-name> 8080:80 8443:443
3436
```
3537

36-
> Note: NGINX will not listen on any ports until you configure a
37-
> [Gateway](https://gateway-api.sigs.k8s.io/api-types/gateway/#gateway) resource with a valid listener.
38+
{{<note>}} NGINX will not listen on any ports until you configure a [Gateway](https://gateway-api.sigs.k8s.io/api-types/gateway/#gateway) resource with a valid listener. {{</note>}}
39+
3840

3941
## Use NGINX Gateway Fabric
4042

0 commit comments

Comments
 (0)