Skip to content

Commit e148494

Browse files
jawfu-Mjawfu-M
authored
Merge branch 'main' into Update-docs-issue147
2 parents 44dbe35 + b39c379 commit e148494

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎.github/workflows/build-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
5959
call-docs-build-push:
6060
needs: prod-check-branch
61-
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@bc2ae667727ba02b3d70dacee231ce04f7d94344 # v1.0.8
61+
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@cc69def33942d819719164723b35b5163d838276 # v1.0.9
6262
with:
6363
production_url_path: ""
6464
preview_url_path: "${{ vars.PREVIEW_URL_PATH }}"

‎content/includes/nim/kubernetes/nms-chart-supported-module-versions.md‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,40 @@ docs: DOCS-1324
44

55
{{<bootstrap-table "table table-striped table-bordered">}}
66

7-
| NGINX Instance Manager chart | Instance Manager |
8-
|------------------------------|------------------|
9-
| 2.0.0 | 2.20.0 |
10-
| 1.15.0 | 2.18.0 |
11-
| 1.14.4 | 2.17.4 |
12-
| 1.14.0 | 2.17.0 |
13-
| 1.13.0 | 2.16.0 |
14-
| 1.12.1 | 2.15.1 |
15-
| 1.12.0 | 2.15.0 |
16-
| 1.11.0 | 2.14.0 |
17-
| 1.10.1 | 2.13.1 |
18-
| 1.10.0 | 2.13.1 |
19-
| 1.9.0 | 2.13.0 |
20-
| 1.8.2 | 2.12.0 |
21-
| 1.8.1 | 2.12.0 |
22-
| 1.8.0 | 2.12.0 |
23-
| 1.7.2 | 2.11.0 |
24-
| 1.7.1 | 2.11.0 |
25-
| 1.7.0 | 2.11.0 |
26-
| 1.6.0 | 2.10.1 |
27-
| 1.5.2 | 2.10.0 |
28-
| 1.5.1 | 2.10.0 |
29-
| 1.5.0 | 2.10.0 |
30-
| 1.4.0 | 2.9.1 |
31-
| 1.3.1 | 2.9.0 |
32-
| 1.3.0 | 2.9.0 |
33-
| 1.2.1 | 2.8.0 |
34-
| 1.2.0 | 2.8.0 |
35-
| 1.1.2 | 2.7.0 |
36-
| 1.1.1 | 2.7.0 |
37-
| 1.1.0 | 2.7.0 |
38-
| 1.0.0 | 2.6.0 |
7+
| NGINX Instance Manager chart | Chart | Instance Manager |
8+
|------------------------------|----------------------------|------------------|
9+
| 2.0.0 | nginx-stable/nim | 2.20.0 |
10+
| 2.19.2 | nginx-stable/nms-hybrid | 2.19.2 |
11+
| 2.19.1 | nginx-stable/nms-hybrid | 2.19.1 |
12+
| 2.19.0 | nginx-stable/nms-hybrid | 2.19.0 |
13+
| 1.15.0 | ngnx-stable/nms | 2.18.0 |
14+
| 1.14.4 | ngnx-stable/nms | 2.17.4 |
15+
| 1.14.0 | ngnx-stable/nms | 2.17.0 |
16+
| 1.13.0 | ngnx-stable/nms | 2.16.0 |
17+
| 1.12.1 | ngnx-stable/nms | 2.15.1 |
18+
| 1.12.0 | ngnx-stable/nms | 2.15.0 |
19+
| 1.11.0 | ngnx-stable/nms | 2.14.0 |
20+
| 1.10.1 | ngnx-stable/nms | 2.13.1 |
21+
| 1.10.0 | ngnx-stable/nms | 2.13.1 |
22+
| 1.9.0 | ngnx-stable/nms | 2.13.0 |
23+
| 1.8.2 | ngnx-stable/nms | 2.12.0 |
24+
| 1.8.1 | ngnx-stable/nms | 2.12.0 |
25+
| 1.8.0 | ngnx-stable/nms | 2.12.0 |
26+
| 1.7.2 | ngnx-stable/nms | 2.11.0 |
27+
| 1.7.1 | ngnx-stable/nms | 2.11.0 |
28+
| 1.7.0 | ngnx-stable/nms | 2.11.0 |
29+
| 1.6.0 | ngnx-stable/nms | 2.10.1 |
30+
| 1.5.2 | ngnx-stable/nms | 2.10.0 |
31+
| 1.5.1 | ngnx-stable/nms | 2.10.0 |
32+
| 1.5.0 | ngnx-stable/nms | 2.10.0 |
33+
| 1.4.0 | ngnx-stable/nms | 2.9.1 |
34+
| 1.3.1 | ngnx-stable/nms | 2.9.0 |
35+
| 1.3.0 | ngnx-stable/nms | 2.9.0 |
36+
| 1.2.1 | ngnx-stable/nms | 2.8.0 |
37+
| 1.2.0 | ngnx-stable/nms | 2.8.0 |
38+
| 1.1.2 | ngnx-stable/nms | 2.7.0 |
39+
| 1.1.1 | ngnx-stable/nms | 2.7.0 |
40+
| 1.1.0 | ngnx-stable/nms | 2.7.0 |
41+
| 1.0.0 | ngnx-stable/nms | 2.6.0 |
3942

4043
{{</bootstrap-table>}}

‎content/nginx/admin-guide/installing-nginx/installing-nginx-docker.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ sudo docker run \
221221
```
222222

223223
To start the Docker container with NGINX Plus and NGINX Agent,
224-
you will need to additionally pass the NGINX One data plane key as the `NGINX_AGENT_SERVER_TOKEN` environment variable. For more information, see [Create and manage data plane keys](https://docs.nginx.com/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys/):
224+
you will need to additionally pass the NGINX One data plane key as the `NGINX_AGENT_SERVER_TOKEN` environment variable. For more information, see [Create and manage data plane keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}}):
225225

226226
```sh
227227
sudo docker run \

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ helm install nim nginx-stable/nim \
213213

214214
- Replace `<your-password>` with your preferred admin password.
215215
- Replace `<your-values.yaml>` with the path to your customized values.yaml file.
216-
- Replace `<chart-version>` with the version you want to install (for example, `2.20.0`).
216+
- Replace `<chart-version>` with the version you want to install (for example, `2.0.0`).
217217

218218
**Note:** You can set the ClickHouse mode at install time instead of editing `values.yaml`:
219219

@@ -269,13 +269,13 @@ helm upgrade nim nginx-stable/nim \
269269
-n nim \
270270
--set adminPasswordHash=$(openssl passwd -6 '<your-password>') \
271271
-f <path-to-your-values.yaml> \
272-
--version <nim-version> \
272+
--version <chart-version> \
273273
--wait
274274
```
275275

276-
- Replace `<your-password>` with a secure password that includes uppercase and lowercase letters, numbers, and special characters.
277-
- Replace `<path-to-your-values.yaml>` with the full path to your configuration file.
278-
- Replace `<nim-version>` with the version of NGINX Instance Manager you want to upgrade to.
276+
- Replace `<your-password>` with your preferred admin password.
277+
- Replace `<your-values.yaml>` with the path to your customized values.yaml file.
278+
- Replace `<chart-version>` with the version you want to install (for example, `2.0.0`).
279279

280280

281281
{{< call-out "important" "Save the password!" >}}

‎static/sitemap_index.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<sitemap>
44
<loc>https://docs.nginx.com/sitemap.xml</loc>
55
</sitemap>
6-
<sitemap>
7-
<loc>https://docs.nginx.com/nginx-ingress-controller/sitemap.xml</loc>
8-
</sitemap>
96
<sitemap>
107
<loc>https://unit.nginx.org/sitemap.xml</loc>
118
</sitemap>

0 commit comments

Comments
 (0)