Skip to content

Commit d3bdc77

Browse files
ADubhlaoichshaun-nxvepatel
authored
Documentation style changes for the "Installation" section (#6015)
This commit is one of a series to update the documentation set to adhere to NGINX's contemporary documentation standards. The three most prominent changes are prepending F5 to the first instance of an NGINX product, changing titles to sentence case, and removing gerunds. A number of pages also had their filenames changed to reflect their contents and to create shorter URL slugs. --------- Signed-off-by: Alan Dooley <[email protected]> Co-authored-by: Shaun <[email protected]> Co-authored-by: Venktesh Shivam Patel <[email protected]>
1 parent dc79e1e commit d3bdc77

22 files changed

+117
-106
lines changed

docs/content/installation/building-nginx-ingress-controller.md renamed to docs/content/installation/build-nginx-ingress-controller.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ description:
33
docs: DOCS-1453
44
doctypes:
55
- installation
6-
title: Building NGINX Ingress Controller
6+
title: Build NGINX Ingress Controller
77
toc: true
88
weight: 200
99
---
1010

11-
Learn how to build an NGINX Ingress Controller image from source code and upload it to a private Docker registry. You'll also find information on the Makefile targets and variables.
11+
This document describes how to build an F5 NGINX Ingress Controller image from source code and upload it to a private Docker registry.
1212

13-
{{<call-out "tip" "Pre-built image alternatives" >}}If you'd rather not build your own NGINX Ingress Controller image, see the [pre-built image options](#pre-built-images) at the end of this guide.{{</call-out>}}
13+
It also includes information on the Makefile targets and variables.
14+
15+
{{<call-out "tip" "Pre-built image alternatives" >}} If you do not need to build a custom image, see the [pre-built image options](#pre-built-images) at the end of this guide. {{</call-out>}}
1416

1517
## Before you start
1618

@@ -22,7 +24,7 @@ To get started, you need the following software installed on your machine:
2224
- [OpenSSL](https://www.openssl.org/), optionally, if you would like to generate a self-signed certificate and a key for the default server.
2325
- For NGINX Plus users, download the certificate (_nginx-repo.crt_) and key (_nginx-repo.key_) from [MyF5](https://my.f5.com).
2426

25-
Although NGINX Ingress Controller is written in Golang, you don't need to have Golang installed. You can either download the precompiled binary file or build NGINX Ingress Controller in a Docker container.
27+
Although NGINX Ingress Controller is written in Golang, you don't need to have Golang installed. You can download the precompiled binary file or build NGINX Ingress Controller in a Docker container.
2628

2729
---
2830

@@ -56,7 +58,7 @@ Get your system ready for building and pushing the NGINX Ingress Controller imag
5658

5759
After setting up your environment, follow these steps to build the NGINX Ingress Controller image.
5860

59-
{{<note>}}If you have a local Golang environment and want to build the binary yourself, remove `TARGET=download` from the make commands. If you don't have Golang but still want to build the binary, use `TARGET=container`.{{</note>}}
61+
{{< note >}} If you have a local Golang environment and want to build the binary yourself, remove `TARGET=download` from the make commands. If you don't have Golang but still want to build the binary, use `TARGET=container`. {{< /note >}}
6062
6163
### For NGINX
6264
@@ -100,7 +102,7 @@ After setting up your environment, follow these steps to build the NGINX Ingress
100102
101103
**What to expect**: The image is built and tagged with a version number, which is derived from the `VERSION` variable in the [_Makefile_](#makefile-details). This version number is used for tracking and deployment purposes.
102104
103-
{{<note>}}In the event a patch version of NGINX Plus is released, make sure to rebuild your image to get the latest version. If your system is caching the Docker layers and not updating the packages, add `DOCKER_BUILD_OPTIONS="--pull --no-cache"` to the make command.{{</note>}}
105+
{{<note>}} If a patch for NGINX Plus is released, make sure to rebuild your image to get the latest version. If your system is caching the Docker layers and not updating the packages, add `DOCKER_BUILD_OPTIONS="--pull --no-cache"` to the make command. {{</note>}}
104106
105107
---
106108
@@ -192,7 +194,7 @@ If you prefer not to build your own NGINX Ingress Controller image, you can use
192194
193195
**NGINX Ingress Controller**: Download the image `nginx/nginx-ingress` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress) or [GitHub](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress).
194196
195-
**NGINX Plus Ingress Controller**: You have two options for this, both requiring an NGINX Ingress Controller subscription.
197+
**NGINX Plus Ingress Controller**: You have two options for this:
196198
197-
- Download the image using your NGINX Ingress Controller subscription certificate and key. See the [Getting the F5 Registry NGINX Ingress Controller Image]({{< relref "installation/nic-images/pulling-ingress-controller-image.md" >}}) guide.
198-
- Use your NGINX Ingress Controller subscription JWT token to get the image: Instructions are in [Getting the NGINX Ingress Controller Image with JWT]({{< relref "installation/nic-images/using-the-jwt-token-docker-secret.md" >}}).
199+
- Download the image using your NGINX Ingress Controller subscription certificate and key. View the [Get NGINX Ingress Controller from the F5 Registry]({{< relref "installation/nic-images/get-registry-image" >}}) topic.
200+
- Use your NGINX Ingress Controller subscription JWT token to get the image. View the [Get the NGINX Ingress Controller image with JWT]({{< relref "installation/nic-images/get-image-using-jwt.md" >}}) topic.

docs/content/installation/ingress-nginx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ doctypes:
44
- tutorial
55
tags:
66
- docs
7-
title: Migrating from Ingress-NGINX Controller to NGINX Ingress Controller
7+
title: Migrate from Ingress-NGINX Controller to NGINX Ingress Controller
88
toc: true
99
weight: 500
1010
---
1111

12-
This document describes how to migrate from the community-maintained Ingress-NGINX Controller to the F5 NGINX Ingress Controller.
12+
This document describes how to migrate from the community-maintained Ingress-NGINX Controller to F5 NGINX Ingress Controller.
1313

1414
## Overview
1515

docs/content/installation/installing-nic/installation-with-helm.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ toc: true
77
weight: 100
88
---
99

10-
This document explains how to install NGINX Ingress Controller using [Helm](https://helm.sh/).
10+
This document explains how to install F5 NGINX Ingress Controller using [Helm](https://helm.sh/).
1111

1212
## Before you start
1313

14-
{{<note>}} All documentation should only be used with the latest stable release, indicated on [the releases page]({{< relref "releases.md" >}}) of the GitHub repository. {{</note>}}
14+
{{< note >}} All documentation should only be used with the latest stable release, indicated on [the releases page]({{< relref "releases.md" >}}) of the GitHub repository. {{< /note >}}
1515

16-
- A [Kubernetes Version Supported by the Ingress Controller](https://docs.nginx.com/nginx-ingress-controller/technical-specifications/#supported-kubernetes-versions)
16+
- A [Kubernetes Version Supported by NGINX Ingress Controller](https://docs.nginx.com/nginx-ingress-controller/technical-specifications/#supported-kubernetes-versions)
1717
- Helm 3.0+.
1818
- If you’d like to use NGINX Plus:
19-
- To pull from the F5 Container registry, configure a docker registry secret using your JWT token from the MyF5 portal by following the instructions from [here](https://docs.nginx.com/nginx-ingress-controller/installation/nic-images/using-the-jwt-token-docker-secret). Make sure to specify the secret using `controller.serviceAccount.imagePullSecretName` or `controller.serviceAccount.imagePullSecretsNames` parameter.
20-
- Alternatively, pull an NGINX Ingress Controller image with NGINX Plus and push it to your private registry by following the instructions from [here]({{< relref "installation/nic-images/pulling-ingress-controller-image" >}}).
21-
- Alternatively, you can NGINX build an Ingress Controller image with NGINX Plus and push it to your private registry by following the instructions from [here]({{< relref "installation/building-nginx-ingress-controller.md" >}}).
19+
- Download the image using your NGINX Ingress Controller subscription certificate and key. View the [Get NGINX Ingress Controller from the F5 Registry]({{< relref "installation/nic-images/get-registry-image.md" >}}) topic.
20+
- The [Get the NGINX Ingress Controller image with JWT]({{< relref "installation/nic-images/get-image-using-jwt.md" >}}) topic describes how to use your subscription JWT token to get the image.
21+
- The [Build NGINX Ingress Controller]({{< relref "installation/build-nginx-ingress-controller.md" >}}) topic explains how to push an image to a private Docker registry.
2222
- Update the `controller.image.repository` field of the `values-plus.yaml` accordingly.
2323
- To use App Protect DoS, install the App Protect DoS Arbitrator [Helm Chart](https://github.com/nginxinc/nap-dos-arbitrator-helm-chart) in the same namespace as NGINX Ingress Controller. If you install multiple NGINX Ingress Controllers in the same namespace, they will need to share the same Arbitrator because there can only be one Arbitrator in a single namespace.
2424

@@ -285,11 +285,11 @@ The steps you should follow depend on the Helm release name:
285285
{{</tabs>}}
286286
287287
288-
## Running Multiple Ingress Controllers
288+
## Run multiple Ingress Controllers
289289
290-
If you are running multiple Ingress Controller releases in your cluster with enabled custom resources, the releases will share a single version of the CRDs. As a result, make sure that the Ingress Controller versions match the version of the CRDs. Additionally, when uninstalling a release, ensure that you don’t remove the CRDs until there are no other Ingress Controller releases running in the cluster.
290+
If you are running multiple Ingress Controller releases in your cluster with enabled custom resources, the releases will share a single version of the CRDs. Ensure the Ingress Controller versions match the version of the CRDs. When uninstalling a release, ensure that you don’t remove the CRDs until there are no other Ingress Controller releases running in the cluster.
291291
292-
See [running multiple Ingress Controllers]({{< relref "installation/running-multiple-ingress-controllers.md" >}}) for more details.
292+
The [Run multiple NGINX Ingress Controllers]({{< relref "installation/run-multiple-ingress-controllers.md" >}}) topic has more details.
293293
294294
## Configuration
295295

docs/content/installation/installing-nic/installation-with-manifests.md

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@ This guide explains how to use Manifests to install NGINX Ingress Controller, th
1313

1414
### Get the NGINX Controller Image
1515

16-
{{<note>}} Always use the latest stable release listed on the [releases page]({{< relref "releases.md" >}}). {{</note>}}
16+
{{< note >}} Always use the latest stable release listed on the [releases page]({{< relref "releases.md" >}}). {{< /note >}}
1717

1818
Choose one of the following methods to get the NGINX Ingress Controller image:
1919

2020
- **NGINX Ingress Controller**: Download the image `nginx/nginx-ingress` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress).
2121
- **NGINX Plus Ingress Controller**: You have two options for this, both requiring an NGINX Ingress Controller subscription.
22-
23-
- Download the image using your NGINX Ingress Controller subscription certificate and key. Read the [Getting the F5 Registry NGINX Ingress Controller Image]({{< relref "installation/nic-images/pulling-ingress-controller-image.md" >}}) guide.
24-
- Use your NGINX Ingress Controller subscription JWT token to get the image: Read the [Getting the NGINX Ingress Controller Image with JWT]({{< relref "installation/nic-images/using-the-jwt-token-docker-secret.md" >}}).
25-
26-
- **Build your own image**: To build your own image, follow the [Building NGINX Ingress Controller]({{< relref "installation/building-nginx-ingress-controller.md" >}}) guide.
22+
- Download the image using your NGINX Ingress Controller subscription certificate and key. View the [Get NGINX Ingress Controller from the F5 Registry]({{< relref "installation/nic-images/get-registry-image.md" >}}) topic.
23+
- The [Get the NGINX Ingress Controller image with JWT]({{< relref "installation/nic-images/get-image-using-jwt.md" >}}) topic describes how to use your subscription JWT token to get the image.
24+
- **Build your own image**: To build your own image, follow the [Build NGINX Ingress Controller]({{< relref "installation/build-nginx-ingress-controller.md" >}}) topic.
2725

2826
### Clone the repository
2927

@@ -252,18 +250,18 @@ Connect to ports 80 and 443 using the IP address of any node in the cluster wher
252250
kubectl delete namespace nginx-ingress
253251
```
254252
255-
2. **Remove the cluster role and cluster role binding**:
253+
1. **Remove the cluster role and cluster role binding**:
256254
257255
```shell
258256
kubectl delete clusterrole nginx-ingress
259257
kubectl delete clusterrolebinding nginx-ingress
260258
```
261259
262-
3. **Delete the Custom Resource Definitions**:
260+
1. **Delete the Custom Resource Definitions**:
263261
264-
{{<tabs name="delete-crds">}}
262+
{{<tabs name="delete-crds">}}
265263
266-
{{%tab name="Deleting CRDs from single YAML"%}}
264+
{{%tab name="Deleting CRDs from single YAML"%}}
267265
268266
1. Delete core custom resource definitions:
269267
```shell
@@ -281,23 +279,23 @@ Connect to ports 80 and 443 using the IP address of any node in the cluster wher
281279
```
282280
{{%/tab%}}
283281
284-
{{%tab name="Deleting CRDs after cloning the repo"%}}
282+
{{%tab name="Deleting CRDs after cloning the repo"%}}
285283
286-
1. Delete core custom resource definitions:
287-
```shell
288-
kubectl delete -f config/crd/bases/crds.yaml
289-
```
290-
2. Delete custom resource definitions for the NGINX App Protect WAF module:
284+
1. Delete core custom resource definitions:
285+
```shell
286+
kubectl delete -f config/crd/bases/crds.yaml
287+
```
288+
2. Delete custom resource definitions for the NGINX App Protect WAF module:
291289
292-
```shell
293-
kubectl apply -f config/crd/bases/crds-nap-waf.yaml
294-
```
290+
```shell
291+
kubectl apply -f config/crd/bases/crds-nap-waf.yaml
292+
```
295293
296-
3. Delete custom resource definitions for the NGINX App Protect DoS module:
297-
```shell
298-
kubectl apply -f config/crd/bases/crds-nap-dos.yaml
299-
```
294+
3. Delete custom resource definitions for the NGINX App Protect DoS module:
295+
```shell
296+
kubectl apply -f config/crd/bases/crds-nap-dos.yaml
297+
```
300298
301-
{{%/tab%}}
299+
{{%/tab%}}
302300
303-
{{</tabs>}}
301+
{{</tabs>}}

docs/content/installation/installing-nic/installation-with-operator.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
docs: DOCS-604
33
doctypes:
44
- ''
5-
title: Installation with the NGINX Ingress Operator
5+
title: Installation with NGINX Ingress Operator
66
toc: true
77
weight: 300
88
---
@@ -11,19 +11,17 @@ This document explains how to use NGINX Ingress Operator to install NGINX Ingres
1111

1212
## Before you start
1313

14-
{{<note>}} We recommend the most recent stable version of NGINX Ingress Controller, available on the GitHub repository's [releases page]({{< relref "releases.md" >}}). {{</note>}}
14+
{{< note >}} We recommend the most recent stable version of NGINX Ingress Controller, available on the GitHub repository's [releases page]({{< relref "releases.md" >}}). {{< /note >}}
1515

1616
1. Make sure you have access to the NGINX Ingress Controller image:
17-
1817
- For NGINX Ingress Controller, use the image `nginx/nginx-ingress` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress).
19-
- For NGINX Plus Ingress Controller, see [here]({{< relref "installation/nic-images/pulling-ingress-controller-image" >}}) for details on how to pull the image from the F5 Docker registry.
20-
- To pull from the F5 Container registry, configure a docker registry secret using your JWT token from the MyF5 portal by following the instructions from [here]({{< relref "installation/nic-images/using-the-jwt-token-docker-secret" >}}).
21-
- It is also possible to build your own image and push it to your private Docker registry by following the instructions from [here]({{< relref "installation/building-nginx-ingress-controller.md" >}})).
22-
23-
2. Install the NGINX Ingress Operator following the [instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/docs/installation.md).
24-
3. Create the SecurityContextConstraint as outlined in the ["Getting Started" instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/README.md#getting-started).
18+
- For NGINX Plus Ingress Controller, view the [Get the F5 Registry NGINX Ingress Controller image]({{< relref "installation/nic-images/get-registry-image.md" >}}) topic for details on how to pull the image from the F5 Docker registry.
19+
- The [Get the NGINX Ingress Controller image with JWT]({{< relref "installation/nic-images/get-image-using-jwt.md" >}}) topic describes how to use your subscription JWT token to get the image.
20+
- The [Build NGINX Ingress Controller]({{< relref "installation/build-nginx-ingress-controller.md" >}}) topic explains how to push an image to a private Docker registry.
21+
1. Install the NGINX Ingress Operator following the [instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/docs/installation.md).
22+
1. Create the SecurityContextConstraint as outlined in the ["Getting Started" instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/README.md#getting-started).
2523

26-
{{<note>}} If you're upgrading your operator installation to a later release, navigate [here](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/helm-charts/nginx-ingress) and run `kubectl apply -f crds/` or `oc apply -f crds/` as a prerequisite{{</note>}}
24+
{{< note >}} If you're upgrading your operator installation to a later release, navigate [here](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/helm-charts/nginx-ingress) and run `kubectl apply -f crds/` or `oc apply -f crds/` as a prerequisite {{< /note >}}
2725

2826
## Create the NGINX Ingress Controller manifest
2927

@@ -50,7 +48,7 @@ spec:
5048
imagePullSecretName: ""
5149
```
5250
53-
{{<note>}}For NGINX Plus, change the `image.repository` and `image.tag` values and change `nginxPlus` to `True`. If required, set the `serviceAccount.imagePullSecretName` or `serviceAccount.imagePullSecretsNames` to the name of the pre-created docker config secret that should be associated with the ServiceAccount.{{</note>}}
51+
{{< note >}} For NGINX Plus, change the `image.repository` and `image.tag` values and change `nginxPlus` to `True`. If required, set the `serviceAccount.imagePullSecretName` or `serviceAccount.imagePullSecretsNames` to the name of the pre-created docker config secret that should be associated with the ServiceAccount. {{< /note >}}
5452

5553
## Deploy NGINX Ingress Controller
5654

docs/content/installation/integrations/app-protect-dos/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ weight: 200
99

1010
{{< tip >}}
1111

12-
Check out the complete [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos).
12+
Check out the complete [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos).
1313

1414
{{< /tip >}}
1515

0 commit comments

Comments
 (0)