Skip to content

Commit 4e3852a

Browse files
authored
Merge branch 'main' into Update-docs-issue147
2 parents 067c1d7 + 7d206bb commit 4e3852a

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

content/includes/nim/installation/install-script-flags/distribution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ files:
1010
To see the list of supported distributions, run:
1111

1212
```shell
13-
grep '\-d distribution' install-nim-bundle.sh
13+
install-nim-bundle.sh -l
1414
```

content/nic/technical-specifications.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ We recommend using the latest release of NGINX Ingress Controller. We provide so
1717
We test NGINX Ingress Controller on a range of Kubernetes platforms for each release, and list them in the [release notes]({{< ref "/nic/releases.md" >}}). We provide technical support for NGINX Ingress Controller on any Kubernetes platform that is currently supported by its provider, and that passes the [Kubernetes conformance tests](https://www.cncf.io/certification/software-conformance/).
1818

1919
{{< bootstrap-table "table table-bordered table-striped table-responsive" >}}
20-
| NIC version | Kubernetes versions tested | NIC Helm Chart version | NIC Operator version | NGINX / NGINX Plus version |
21-
| --- | --- | --- | --- | --- |
22-
| {{< nic-version >}} | 1.25 - 1.32 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.4 / R34 |
23-
| 4.0.1 | 1.25 - 1.32 | 2.0.1 | 3.0.1 | 1.27.4 / R33 P2 |
24-
| 3.7.2 | 1.25 - 1.31 | 1.4.2 | 2.4.2 | 1.27.2 / R32 P1 |
25-
| 3.6.2 | 1.25 - 1.31 | 1.3.2 | 2.3.2 | 1.27.1 / R32 P1 |
26-
| 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 |
27-
| 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 |
28-
| 3.3.2 | 1.22 - 1.28 | 1.0.2 | 2.0.2 | 1.25.3 / R30 |
29-
| 3.2.1 | 1.22 - 1.27 | 0.18.1 | 1.5.1 | 1.25.2 / R30 |
30-
| 3.1.1 | 1.22 - 1.26 | 0.17.1 | 1.4.2 | 1.23.4 / R29 |
20+
| NIC version | Kubernetes versions tested | NIC Helm Chart version | NIC Operator version | NGINX / NGINX Plus version | End of Technical Support |
21+
| --- | --- | --- | --- | --- | --- |
22+
| {{< nic-version >}} | 1.25 - 1.32 | {{< nic-helm-version >}} | {{< nic-operator-version >}} | 1.27.4 / R34 | - |
23+
| 4.0.1 | 1.25 - 1.32 | 2.0.1 | 3.0.1 | 1.27.4 / R33 P2 | Feb 7, 2027 |
24+
| 3.7.2 | 1.25 - 1.31 | 1.4.2 | 2.4.2 | 1.27.2 / R32 P1 | Nov 25, 2026 |
25+
| 3.6.2 | 1.25 - 1.31 | 1.3.2 | 2.3.2 | 1.27.1 / R32 P1 | Aug 19, 2026 |
26+
| 3.5.2 | 1.23 - 1.30 | 1.2.2 | 2.2.2 | 1.27.0 / R32 | May 31, 2026 |
27+
| 3.4.3 | 1.23 - 1.29 | 1.1.3 | 2.1.2 | 1.25.4 / R31 P1 | Feb 19, 2026 |
28+
| 3.3.2 | 1.22 - 1.28 | 1.0.2 | 2.0.2 | 1.25.3 / R30 | Nov 1, 2025 |
29+
| 3.2.1 | 1.22 - 1.27 | 0.18.1 | 1.5.1 | 1.25.2 / R30 | Aug 18, 2025 |
3130
{{% /bootstrap-table %}}
3231

3332
---

content/nim/deploy/vm-bare-metal/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The installation script installs the latest version of [NGINX Open Source](https
5454
To see the list of supported distributions, run:
5555

5656
```shell
57-
grep '\-d distribution' install-nim-bundle.sh
57+
install-nim-bundle.sh -l
5858
```
5959

6060
### Security considerations

content/nim/disconnected/add-license-disconnected-deployment.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ To add a license and submit the initial usage report in a disconnected environme
6565
-j <license-filename>.jwt \
6666
-i <NIM-IP-address> \
6767
-u admin \
68-
-p <password> \
69-
-o report.zip \
68+
-p <password> \
7069
-s initial
7170
```
7271

static/scripts/install-nim-bundle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ printSupportedOS(){
811811
printf "\n 6. centos8(CentOS 8)"
812812
printf "\n 7. rhel8(Redhat Enterprise Linux Version 8)"
813813
printf "\n 8. rhel9( Redhat Enterprise Linux Version 9)"
814-
printf "\n 9. oracle8(Oracle Linux Version 8)\n"
814+
printf "\n 9. oracle8(Oracle Linux Version 8)"
815815
printf "\n 10. oracle9(Oracle Linux Version 9)\n"
816816
exit 0
817817
}

0 commit comments

Comments
 (0)