Skip to content

Commit a9ecc38

Browse files
committed
Merge branch 'epic-472-port-nginx-one-labs' into port-lab-3
2 parents 5f50bea + a4b29ca commit a9ecc38

File tree

339 files changed

+31044
-5632
lines changed

Some content is hidden

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

339 files changed

+31044
-5632
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/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@bc2ae667727ba02b3d70dacee231ce04f7d94344 # v1.0.8
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/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Run analysis
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
59+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
6060
with:
6161
sarif_file: results.sarif

_banners/agent-v3-release.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{{< banner "notice" "NGINX Agent 3.0 is now available" >}}
2+
3+
4+
F5 NGINX One Console does not currently support Agent 3.x. If you are using NGINX One Console in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
5+
6+
Please see the [Technical specifications](/nginx-agent/technical-specifications/) for product compatibility.
7+
8+
9+
{{< /banner >}}

_banners/ngf-2.0-release.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{< banner "notice" "NGINX Gateway Fabric 2.0 is now available" >}}
2+
3+
NGINX Gateway Fabric 2.0 has released! Follow [these instructions]({{< ref "/ngf/install/upgrade-version.md#upgrade-from-v1x-to-v2x" >}}) to upgrade from 1.x to 2.0.
4+
5+
For 1.x, checkout [an older version]({{< ref "/ngf/install/upgrade-version.md#access-nginx-gateway-fabric-1x-documentation" >}}) of documentation.
6+
7+
{{< /banner >}}

_banners/upgrade-r33.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{< banner "caution" "NGINX Plus R33 requires NGINX Instance Manager 2.18 or later" >}}
22
If your NGINX data plane instances are running NGINX Plus R33 or later, you must upgrade to NGINX Instance Manager 2.18 or later to support usage reporting. NGINX Plus R33 instances must report usage data to the F5 licensing endpoint or NGINX Instance Manager. Otherwise, they will stop processing traffic.
33
<br><br>
4-
For more details about usage reporting and enforcement, see [About solution licenses](../../../../solutions/about-subscription-licenses)
4+
For more details about usage reporting and enforcement, see [About solution licenses]({{< ref "/solutions/about-subscription-licenses.md" >}})
55
{{</ banner >}}

0 commit comments

Comments
 (0)