Skip to content

Commit 11f7932

Browse files
committed
chore: Merge remote-tracking branch 'origin/main' into agent-release-3.0
2 parents 976ad4f + c005b50 commit 11f7932

File tree

5 files changed

+202
-31
lines changed

5 files changed

+202
-31
lines changed

content/nginx-one/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ The F5 NGINX One Console makes it easy to manage NGINX instances across location
2121
[//]: # "Some examples of content could be the latest release note, the most common install path, and a popular new feature."
2222
{{<card-layout>}}
2323
{{<card-section showAsCards="true" isFeaturedSection="true">}}
24-
{{<card title="Get started" titleUrl="getting-started/" isFeatured="true" icon="unplug">}}
24+
{{<card title="Get started" titleUrl="nginx-one/getting-started/" isFeatured="true" icon="unplug">}}
2525
See benefits from the NGINX One Console
2626
{{</card >}}
27-
{{<card title="Changelog" titleUrl="changelog/" icon="clock-alert">}}
27+
{{<card title="Changelog" titleUrl="nginx-one/changelog/" icon="clock-alert">}}
2828
See latest updates: New features, improvements, and bug fixes
2929
{{</card>}}
30-
{{<card title="Add an NGINX instance" titleUrl="connect-instances/add-instance/" icon="copy-plus">}}
30+
{{<card title="Add an NGINX instance" titleUrl="nginx-one/connect-instances/add-instance/" icon="copy-plus">}}
3131
Connect your instances to NGINX One
3232
{{</card>}}
3333
{{</card-section>}}

content/nginx-one/changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ h2 {
3030

3131
Stay up-to-date with what's new and improved in the F5 NGINX One Console.
3232

33+
## July 1, 2025
34+
35+
### NGINX Agent version 3 support
36+
37+
We have added support for NGINX Agent 3.x in NGINX One Console. You can now:
38+
39+
- Manage data plane instances with NGINX Agent version 3.
40+
3341
## May 19, 2025
3442

3543
### Import and export your Staged Configs
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
title: "Module Changelog"
3+
weight: 950
4+
toc: true
5+
url: /nginxaas/azure/module-changelog/
6+
---
7+
8+
Learn about the modules supported by the latest versions of F5 NGINX as a Service for Azure.
9+
10+
11+
## July 03, 2025
12+
13+
### Stable
14+
15+
{{<bootstrap-table "table table-bordered table-striped table-responsive table-sm">}}
16+
17+
| Name | Version | Description |
18+
|------------------------------------------|--------------------------|------------------------------------------------------------------------|
19+
| nginx-plus | 1.27.2 (nginx-plus-r33-p2) | NGINX Plus, provided by Nginx, Inc. |
20+
| nginx-agent | 1.19.15-1795423089 | NGINX Agent - Management for NGINXaaS |
21+
| Operating System | Ubuntu 22.04.5 | Jammy Jellyfish, provided by Canonical Ltd. |
22+
| nginx-plus-module-geoip2 | 33+3.4-1 | NGINX Plus 3rd-party GeoIP2 dynamic modules |
23+
| nginx-plus-module-headers-more | 33+0.37-1 | NGINX Plus 3rd-party headers-more dynamic module |
24+
| nginx-plus-module-image-filter | 33-1 | NGINX Plus image filter dynamic module |
25+
| nginx-plus-module-lua | 33+0.10.27-1 | NGINX Plus 3rd-party Lua dynamic modules |
26+
| nginx-plus-module-ndk | 33+0.3.3-1 | NGINX Plus 3rd-party NDK dynamic module |
27+
| nginx-plus-module-njs | 33+0.8.9-1 | NGINX Plus njs dynamic modules |
28+
| nginx-plus-module-otel | 33+0.1.0-1 | NGINX Plus OpenTelemetry dynamic module |
29+
| nginx-plus-module-xslt | 33-1 | NGINX Plus xslt dynamic module |
30+
| nginx-plus-module-appprotect | 33+5.264.0-1 | NGINX Plus app protect dynamic module version 5.264.0 |
31+
| app-protect-module-plus | 33+5.264.0-1 | App-Protect package for Nginx Plus, includes all of the default files and examples. NGINX App Protect provides web application firewall (WAF) security protection for your web applications, including OWASP Top 10 attacks. |
32+
| app-protect-plugin | 6.9.0-1 | NGINX App Protect plugin |
33+
{{</bootstrap-table>}}
34+
35+
36+
37+
### Preview
38+
39+
{{<bootstrap-table "table table-bordered table-striped table-responsive table-sm">}}
40+
41+
| Name | Version | Description |
42+
|------------------------------------------|--------------------------|------------------------------------------------------------------------|
43+
| nginx-plus | 1.27.2 (nginx-plus-r33-p2) | NGINX Plus, provided by Nginx, Inc. |
44+
| nginx-agent | 1.19.15-1795423089 | NGINX Agent - Management for NGINXaaS |
45+
| Operating System | Ubuntu 22.04.5 | Jammy Jellyfish, provided by Canonical Ltd. |
46+
| nginx-plus-module-geoip2 | 33+3.4-1 | NGINX Plus 3rd-party GeoIP2 dynamic modules |
47+
| nginx-plus-module-headers-more | 33+0.37-1 | NGINX Plus 3rd-party headers-more dynamic module |
48+
| nginx-plus-module-image-filter | 33-1 | NGINX Plus image filter dynamic module |
49+
| nginx-plus-module-lua | 33+0.10.27-1 | NGINX Plus 3rd-party Lua dynamic modules |
50+
| nginx-plus-module-ndk | 33+0.3.3-1 | NGINX Plus 3rd-party NDK dynamic module |
51+
| nginx-plus-module-njs | 33+0.8.9-1 | NGINX Plus njs dynamic modules |
52+
| nginx-plus-module-otel | 33+0.1.0-1 | NGINX Plus OpenTelemetry dynamic module |
53+
| nginx-plus-module-xslt | 33-1 | NGINX Plus xslt dynamic module |
54+
| nginx-plus-module-appprotect | 33+5.264.0-1 | NGINX Plus app protect dynamic module version 5.264.0 |
55+
| app-protect-module-plus | 33+5.264.0-1 | App-Protect package for Nginx Plus, includes all of the default files and examples. NGINX App Protect provides web application firewall (WAF) security protection for your web applications, including OWASP Top 10 attacks. |
56+
| app-protect-plugin | 6.9.0-1 | NGINX App Protect plugin |
57+
{{</bootstrap-table>}}

content/nim/deploy/kubernetes/deploy-using-helm.md

Lines changed: 130 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Starting with version 2.20.0, NGINX Instance Manager supports **lightweight mode
1717

1818
- Lightweight mode requires NGINX Agent v2.41.1 or later.
1919

20-
{{< call-out "note" "Chart renamed in NIM 2.20.0" >}}
21-
The Helm chart has been renamed from `nginx-stable/nms-hybrid` to `nginx-stable/nim`.
22-
Make sure to update your chart references if you’re using version 2.20.0 or later.
20+
21+
{{< call-out "note" "Chart renamed with new versioning from NGINX Instance Manager 2.20.0" >}}
22+
Starting with version 2.20.0, the Helm chart was renamed from `nginx-stable/nms-hybrid` to `nginx-stable/nim`. Chart versioning was also reset; `v2.0.0` is the first release under the new name. Be sure to update your chart references if you’re using version `2.20.0` or later.
2323
{{< /call-out >}}
2424

2525

@@ -149,40 +149,34 @@ imagePullSecrets:
149149
apigw:
150150
image:
151151
repository: private-registry.nginx.com/nms/apigw
152-
tag: 2.20.0
153-
152+
tag: <version>
154153
core:
155154
image:
156155
repository: private-registry.nginx.com/nms/core
157-
tag: 2.20.0
158-
156+
tag: <version>
159157
dpm:
160158
image:
161159
repository: private-registry.nginx.com/nms/dpm
162-
tag: 2.20.0
163-
160+
tag: <version>
164161
ingestion:
165162
image:
166163
repository: private-registry.nginx.com/nms/ingestion
167-
tag: 2.20.0
168-
164+
tag: <version>
169165
integrations:
170166
image:
171167
repository: private-registry.nginx.com/nms/integrations
172-
tag: 2.20.0
173-
168+
tag: <version>
174169
secmon:
175170
image:
176171
repository: private-registry.nginx.com/nms/secmon
177-
tag: 2.20.0
178-
172+
tag: <version>
179173
utility:
180174
image:
181175
repository: private-registry.nginx.com/nms/utility
182-
tag: 2.20.0
176+
tag: <version>
183177
```
184178

185-
These values are required when pulling images from the NGINX private registry. The chart does not auto-resolve image tags. Update the tag: fields to match the NGINX Instance Manager version you want to install.
179+
These values are required when pulling images from the NGINX private registry. The chart doesn't auto-resolve image tags. Set each `tag:` value to match the NGINX Instance Manager version you want to install. Refer to the Helm chart table for version details.
186180
187181
Use the file with the `-f values.yaml` flag when installing the chart.
188182
@@ -236,6 +230,11 @@ helm status nim -n nim
236230
237231
You should see `STATUS: deployed` in the output.
238232
233+
234+
To find the right NGINX Instance Manager chart version, see the following table:
235+
236+
{{< include "nim/kubernetes/nms-chart-supported-module-versions.md" >}}
237+
239238
---
240239
241240
## Access the web interface
@@ -346,6 +345,112 @@ networkPolicies:
346345
347346
---
348347
348+
## Helm deployment for NGINX Instance Manager 2.19
349+
350+
### Create a Helm deployment values.yaml file
351+
352+
The `values.yaml` file customizes the Helm chart installation without changing the chart itself. You can use it to set image repositories, environment variables, resource requests, and other options.
353+
354+
1. Create a `values.yaml` file like this example:
355+
356+
- In the `imagePullSecrets` section, add your private Docker registry credentials.
357+
- Set the `tag:` field to the version of NGINX Instance Manager you want to install. You can find supported versions in the Helm chart table.
358+
359+
For details on creating a secret, see the Kubernetes [Pull an Image from a Private Registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) guide.
360+
361+
```yaml
362+
imagePullSecrets:
363+
- name: regcred
364+
365+
apigw:
366+
image:
367+
repository: private-registry.nginx.com/nms/apigw
368+
tag: <version>
369+
core:
370+
image:
371+
repository: private-registry.nginx.com/nms/core
372+
tag: <version>
373+
dpm:
374+
image:
375+
repository: private-registry.nginx.com/nms/dpm
376+
tag: <version>
377+
ingestion:
378+
image:
379+
repository: private-registry.nginx.com/nms/ingestion
380+
tag: <version>
381+
integrations:
382+
image:
383+
repository: private-registry.nginx.com/nms/integrations
384+
tag: <version>
385+
secmon:
386+
image:
387+
repository: private-registry.nginx.com/nms/secmon
388+
tag: <version>
389+
utility:
390+
image:
391+
repository: private-registry.nginx.com/nms/utility
392+
tag: <version>
393+
```
394+
395+
396+
2. Save and close the `values.yaml` file.
397+
398+
---
399+
400+
### Install the chart
401+
402+
Run the `helm install` command to deploy NGINX Instance Manager:
403+
404+
1. Replace `<path-to-your-values.yaml>` with the path to your `values.yaml` file.
405+
2. Replace `<your-password>` with a secure password (containing a mix of uppercase, lowercase letters, numbers, and special characters).
406+
407+
{{< important >}} Remember to save the password for future use. Only the encrypted password is stored, and there's no way to recover or reset it if lost. {{< /important >}}
408+
409+
410+
```shell
411+
helm install -n nms-hybrid \
412+
--set adminPasswordHash=$(openssl passwd -6 '<your-password>') \
413+
nms nginx-stable/nms-hybrid \
414+
--create-namespace \
415+
-f <path-to-your-values.yaml> \
416+
--version <chart-version> \
417+
--wait
418+
```
419+
420+
---
421+
422+
### Upgrade NGINX Instance Manager
423+
424+
To upgrade:
425+
426+
1. [Update the Helm repository list](#add-repository).
427+
2. [Adjust your `values.yaml` file](#create-a-helm-deployment-values.yaml-file) if needed.
428+
3. To upgrade the NGINX Instance Manager deployment, run the following command. This command updates the `nms` deployment with a new version from the `nginx-stable/nms-hybrid` repository. It also hashes the provided password and uses the `values.yaml` file at the path you specify.
429+
4. Replace `<chart-version>` with the desired chart version of NGINX Instance Manager 2.19.x referring the Helm chart table.
430+
431+
```shell
432+
helm upgrade -n nms \
433+
--set nms-hybrid.adminPasswordHash=$(openssl passwd -6 '<your-password>') \
434+
nms nginx-stable/nms-hybrid \
435+
-f <path-to-your-values.yaml> \
436+
--version <chart-version> \
437+
--wait
438+
```
439+
440+
- Replace `<path-to-your-values.yaml>` with the path to the `values.yaml` file you created]({{< ref "/nim/deploy/kubernetes/deploy-using-helm.md#configure-chart" >}}).
441+
- Replace `<your-password>` with a secure password that includes uppercase and lowercase letters, numbers, and special characters.
442+
443+
{{<call-out "important" "Save the password!" "" >}} Save this password for future use. Only the encrypted password is stored in Kubernetes, and you can’t recover or reset it later. {{</call-out>}}
444+
445+
{{< call-out "note" "Upgrading from 2.18.0 or earlier to 2.19.x" >}}
446+
If you're upgrading from version 2.18.0 or earlier to 2.19.x, note the following changes:
447+
448+
- If you used the legacy `nms` chart or release name, update the chart reference and adjust the release name if needed.
449+
- The structure of the `values.yaml` file has changed in this release.
450+
{{< /call-out >}}
451+
452+
---
453+
349454
## Helm Deployment for NGINX Instance Manager 2.18 or lower
350455
351456
### Create a Helm deployment values.yaml file
@@ -414,10 +519,6 @@ nms nginx-stable/nms \
414519
--wait
415520
```
416521

417-
To help you choose the right NGINX Instance Manager chart version, see the table in:
418-
419-
{{< include "nim/kubernetes/nms-chart-supported-module-versions.md" >}}
420-
421522
---
422523

423524
### Upgrade NGINX Instance Manager
@@ -462,9 +563,14 @@ openshift:
462563

463564
This ensures pods can run with the user IDs required by NGINX Instance Manager services.
464565

465-
{{< call-out "note" "Note" >}}
466-
If you see permission errors during deployment, your user account might not have access to manage SCCs. Contact a cluster administrator to request access.
467-
{{< /call-out >}}
566+
567+
When `openshift.enabled: true` is set in the `values.yaml` file, the NGINX Instance Manager deployment automatically creates a custom [Security Context Constraints (SCC)](https://docs.redhat.com/en/documentation/openshift_container_platform/4.13/html/authentication_and_authorization/managing-pod-security-policies) object and links it to the Service Account used by all pods.
568+
569+
By default, OpenShift enforces strict security policies that require containers to run as **non-root** users. The deployment needs specific user IDs (UIDs) for certain services—**1000** for `nms`, and **101** for `nginx` and `clickhouse`. Since the default SCCs don’t allow these UIDs, the deployment creates a custom SCC. This SCC sets the `runAsUser` field to allow the necessary UIDs while still complying with OpenShift’s security standards.
570+
571+
This deployment has been tested with OpenShift v4.13.0 Server.
572+
573+
If you see permission errors during deployment, your account might not have access to manage SCCs. Ask a cluster administrator for access.
468574

469575
To verify that the SCC was created after installing the Helm chart, run:
470576

documentation/style-guide.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ This document provides guidelines specific to documenting F5 NGINX products and
2020

2121
When writing documentation for our project, align with the default guide's voice and tone.
2222

23-
2423
## F5 brand trademarks and product names
2524

2625
- On the first mention of an enterprise NGINX product in a document, use the full product name. For example:
@@ -48,8 +47,11 @@ When writing documentation for our project, align with the default guide's voice
4847

4948
- Using NGINX Plus Docker images with NGINX Instance Manager
5049

51-
- Don't use articles ("the", "a") in front of product names. For example, use
50+
- Don't use articles ("the", "a") in front of product names. For example, use:
5251
- NGINX Agent (not "the NGINX Agent").
52+
- An article can be used if the product name is qualifying another noun. For example, use:
53+
- Edit the NGINX Agent configuration file (not "Edit NGINX Agent configuration file"): In this case, "NGINX Agent" is a descriptor for the term "configuration file".
54+
- Expose NGINX Agent's REST API: In this case, NGINX Agent is a standalone noun phrase, and it "possesses" the REST API.
5355
- Always use the full brand name in the meta description. The meta description does not count as first mention of the product in the document.
5456

5557

@@ -343,7 +345,6 @@ The table provides guidelines about the terms you should and should not use for
343345
| Wizard and wizard | When documenting the GUI, you can capitalize Wizard if appropriate, such as for the Network Access Setup Wizard. When writing about wizards in general, or when a page title of a dialog box or GUI does not show Wizard in uppercase format, you can leave wizard in lowercase format. | |
344346
| WWW or www | Do not include www. in web addresses In text, do not use WWW, but use Internet instead. Of course, you can use www as part of a URL. Although we're moving away from that, too. | |
345347

346-
---
347348

348349
## Topic types and templates
349350

@@ -466,7 +467,6 @@ Before reloading or restarting NGINX, always check the syntax of the NGINX confi
466467
sudo nginx -t
467468
```
468469

469-
470470
- **sudo systemctl nginx reload**
471471
Use `reload` to apply configuration changes without stopping active connections. This keeps the NGINX service running while updating the configuration. It’s the preferred option for most changes because it avoids downtime and doesn’t interrupt users.
472472

0 commit comments

Comments
 (0)