Skip to content

Commit cde13b5

Browse files
ADubhlaoichADubhlaoich
authored
Merge branch 'main' into fix/nginx-one-console-labels
2 parents 3254fe5 + 4f0ba08 commit cde13b5

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

‎content/includes/nginx-plus/supported-distributions.md‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ docs:
33
---
44

55
{{<bootstrap-table "table table-striped table-bordered">}}
6-
| Distribution | Supported on R33 | Supported on R32 |
7-
|-------------------------------------|-----------------------------------------------|-----------------------------------------------|
8-
| AlmaLinux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
9-
| Alpine Linux | 3.17 (x86_64, aarch64) **(deprecated)** <br> 3.18 (x86_64, aarch64) <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) **(new)** | 3.16 (x86_64, aarch64) **(deprecated)** <br> 3.17 (x86_64, aarch64) <br> 3.18 (x86_64, aarch64) <br> 3.19 (x86_64, aarch64) |
10-
| Amazon Linux | 2023 (x86_64, aarch64) | 2023 (x86_64, aarch64) |
11-
| Amazon Linux 2 | LTS (x86_64, aarch64) | LTS (x86_64, aarch64) |
12-
| CentOS | **Not supported** | 7.4+ (x86_64) **(deprecated)** |
13-
| Debian | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) |
14-
| FreeBSD | 13 (amd64) <br> 14 (amd64) | 13 (amd64) <br> 14 (amd64) |
15-
| Oracle Linux | 8.1+ (x86_64, aarch64) <br> 9 (x86_64) | 7.4+ (x86_64) **(deprecated)** <br> 8.1+ (x86_64, aarch64) <br> 9 (x86_64) |
16-
| Red Hat Enterprise Linux (RHEL) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) | 7.4+ (x86_64) **(deprecated)** <br> 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) |
17-
| Rocky Linux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
18-
| SUSE Linux Enterprise Server (SLES) | 12 SP5 (x86_64) **(deprecated)** <br> 15 SP2+ (x86_64) | 12 SP5 (x86_64) <br> 15 SP2+ (x86_64) |
19-
| Ubuntu | 20.04 LTS (x86_64, aarch64) <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) | 20.04 LTS (x86_64, aarch64) <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64 **(new)** |
20-
{{</bootstrap-table>}}
6+
| Distribution | Supported on R34 | Supported on R33 |
7+
|-------------------------------------|----------------------------------------------------|--------------------------------------------------------|
8+
| AlmaLinux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
9+
| Alpine Linux | 3.18 (x86_64, aarch64) **(deprecated)** <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) <br> 3.21 (x86_64, aarch64) **(new)** | 3.17 (x86_64, aarch64) **(deprecated)** <br> 3.18 (x86_64, aarch64) <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) **(new)** |
10+
| Amazon Linux | 2023 (x86_64, aarch64) | 2023 (x86_64, aarch64) |
11+
| Amazon Linux 2 | LTS (x86_64, aarch64) | LTS (x86_64, aarch64) |
12+
| Debian | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) |
13+
| FreeBSD | 13 (amd64) <br> 14 (amd64) | 13 (amd64) <br> 14 (amd64) |
14+
| Oracle Linux | 8.1+ (x86_64, aarch64) <br> 9 (x86_64) | 8.1+ (x86_64, aarch64) <br> 9 (x86_64) |
15+
| Red Hat Enterprise Linux (RHEL) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) |
16+
| Rocky Linux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
17+
| SUSE Linux Enterprise Server (SLES) | 15 SP2+ (x86_64) | 12 SP5 (x86_64) **(deprecated)** <br> 15 SP2+ (x86_64) |
18+
| Ubuntu | 20.04 LTS (x86_64, aarch64) **(deprecated)** <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) | 20.04 LTS (x86_64, aarch64) <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) |
19+
{{</bootstrap-table>}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
308308
| **controller.mgmt.licenseTokenSecretName** | Configures the secret used in the [license_token](https://nginx.org/en/docs/ngx_mgmt_module.html#license_token) directive. This key assumes the secret is in the Namespace that NGINX Ingress Controller is deployed in. The secret must be of type `nginx.com/license` with the base64 encoded JWT in the `license.jwt` key. | license-token |
309309
| **controller.mgmt.enforceInitialReport** | Configures the [enforce_initial_report](https://nginx.org/en/docs/ngx_mgmt_module.html#enforce_initial_report) directive, which enables or disables the 180-day grace period for sending the initial usage report. | false |
310310
| **controller.mgmt.usageReport.endpoint** | Configures the endpoint of the [usage_report](https://nginx.org/en/docs/ngx_mgmt_module.html#usage_report) directive. This is used to configure the endpoint NGINX uses to send usage reports to NIM. | product.connect.nginx.com |
311-
| **controller.mgmt.usageReport.interval** | Configures the interval of the [usage_report](https://nginx.org/en/docs/ngx_mgmt_module.html#usage_report) directive. This specifies the frequency that usage reports are sent. This field takes an [NGINX time](https://nginx.org/en/docs/syntax.html). | 1h |
311+
| **controller.mgmt.usageReport.interval** | Configures the interval of the [usage_report](https://nginx.org/en/docs/ngx_mgmt_module.html#usage_report) directive. This specifies the frequency that usage reports are sent. Only seconds(s), minutes(m), and hours(h) are allowed and must be between 60s and 24h. | 1h |
312312
| **controller.mgmt.usageReport.proxyHost** | Configures the host name of the [proxy](https://nginx.org/en/docs/ngx_mgmt_module.html#proxy) directive with optional port. | N/A |
313313
| **controller.mgmt.usageReport.proxyCredentialsSecretName** | Configures the [proxy_username](https://nginx.org/en/docs/ngx_mgmt_module.html#proxy_username) directive as well as the [proxy_password](https://nginx.org/en/docs/ngx_mgmt_module.html#proxy_password) directive using a Kubernetes Opaque Secret. The Secret must contain `username` and `password` fields. | N/A |
314314
| **controller.mgmt.sslVerify** | Configures the [ssl_verify](https://nginx.org/en/docs/ngx_mgmt_module.html#ssl_verify) directive, which enables or disables verification of the usage reporting endpoint certificate. | true |

0 commit comments

Comments
 (0)