Skip to content

Commit 9bfecca

Browse files
authored
Merge branch 'main' into patch-13
2 parents 096c81a + 9df3955 commit 9bfecca

File tree

228 files changed

+24759
-2282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+24759
-2282
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ content/includes/nginxaas-azure/* @nginx/n4a-docs-approvers
3737
content/ngf/* @nginx/nginx-gateway-fabric
3838
content/includes/ngf/* @nginx/nginx-gateway-fabric
3939

40+
# NGINX Ingress Controller
41+
content/nic/* @nginx/kic
42+
content/includes/nic/* @nginx/kic
43+
4044
# NGINX Instance Manager
4145
content/nms/nim/* @nginx/nim-docs-approvers
4246
content/nim/* @nginx/nim-docs-approvers

.github/about.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ product/nginxaas:
7373
- 'content/nginxaas-azure/**'
7474
- 'content/includes/nginxaas-azure/**'
7575

76+
product/nic:
77+
- changed-files:
78+
- any-glob-to-any-file:
79+
- 'content/nic/**'
80+
- 'content/includes/nic/**'
81+
7682
product/nim:
7783
- changed-files:
7884
- any-glob-to-any-file:

.github/workflows/build-push.yml

Lines changed: 31 additions & 10 deletions
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@9c59fab05a8131f4d691ba6ea2b6a119f3ef832a # v1.0.7
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 }}"
@@ -79,16 +79,37 @@ jobs:
7979
runs-on: ubuntu-latest
8080
permissions: read-all
8181
steps:
82-
- name: Trigger 'Slack notification for new theme release' workflow in 'nginx-hugo-theme' repo.
83-
run: |
84-
curl -L \
85-
-X POST \
86-
-H "Accept: application/vnd.github+json" \
87-
-H "Authorization: Bearer ${{ secrets.THEME_SLACK_FLOW_PAT }}" \
88-
-H "X-GitHub-Api-Version: 2022-11-28" \
89-
"https://api.github.com/repos/${{ secrets.OWNER }}/${{ secrets.REPO }}/dispatches" \
90-
-d "{\"event_type\": \"trigger-slack-notification\", \"client_payload\": {\"previewURL\": \"${{ env.PREVIEW_URL }}\", \"author\": \"${{ github.event.client_payload.author}}\", \"tag_name\": \"${{ github.event.client_payload.tag_name }}\", \"release_name\": \"${{ github.event.client_payload.release_name }}\"}}"
82+
- name: Send notification
83+
uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
84+
with:
85+
status: custom
86+
custom_payload: |
87+
{
88+
username: 'Github',
89+
mention: 'channel',
90+
attachments: [{
91+
title: `New theme release - ${{ github.event.client_payload.release_name }}`,
92+
color: '#009223',
93+
fields: [
94+
{
95+
title: 'Tag',
96+
value: `${{ github.event.client_payload.tag_name }}`,
97+
short: true
98+
},
99+
{
100+
title: 'Author',
101+
value: `${{ github.event.client_payload.author }}`,
102+
short: true
103+
},
104+
{
105+
title: 'Preview URL',
106+
value: `${{ env.PREVIEW_URL }}`,
107+
short: true
108+
}]
109+
}]
110+
}
91111
env:
112+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FRIENDS_OF_DOCS }}
92113
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
93114

94115

.github/workflows/check-broken-links.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/notification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ jobs:
7575
}]
7676
}
7777
env:
78-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
78+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_DOCS_INCIDENT }}

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: Upload SARIF results to code scanning
59-
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
59+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
6060
with:
6161
sarif_file: results.sarif

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22
**/.DS_Store
33

4-
# dependencies
4+
# Log files
5+
*.log
56

67
# testing
78
/coverage

config/_default/config.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@ pygmentsUseClasses = true
77
enableGitInfo = true
88

99
[permalinks]
10+
agent = '/nginx-agent/:sections[1:]/:filename'
1011
amplify = '/nginx-amplify/:sections[1:]/:filename'
1112
controller = '/nginx-controller/:sections[1:]/:filename'
1213
mesh = '/nginx-service-mesh/:sections[1:]/:filename'
1314
modsec-waf = '/nginx-waf/:sections[1:]/:filename'
1415
nap-dos = '/nginx-app-protect-dos/:sections[1:]/:filename'
1516
nap-waf = '/nginx-app-protect-waf/:sections[1:]/:filename'
17+
nginxaas = '/nginxaas/azure/:sections[1:]/:filename'
1618
ngf = '/nginx-gateway-fabric/:sections[1:]/:filename'
19+
nic = '/nginx-ingress-controller/:sections[1:]/:filename'
1720
nim = '/nginx-instance-manager/:sections[1:]/:filename'
1821
nms = '/nginx-management-suite/:sections[1:]/:filename'
1922
unit = '/nginx-unit/:sections[1:]/:filename'
20-
agent = '/nginx-agent/:sections[1:]/:filename'
21-
nginxaas = '/nginxaas/azure/:sections[1:]/:filename'
2223

2324
[caches]
2425
[caches.modules]

content/amplify/changelog.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
2-
title: "Changelog"
3-
description: "These release notes list and describe the new features, enhancements, and resolved issues in F5 NGINX Amplify"
2+
title: Changelog
3+
description: These release notes list and describe the new features, enhancements, and resolved issues in F5 NGINX Amplify
44
weight: 900
55
toc: true
6+
docs: DOCS-1691
67
---
78

89
## Sept 21, 2023

0 commit comments

Comments
 (0)