8000 Merge branch 'main' into main · nginx/kubernetes-ingress@ce807fe · GitHub
[go: up one dir, main page]
Skip to content

Commit ce807fe

Browse files
FalltradesFalltrades
authored
Merge branch 'main' into main
2 parents 068831e + 432826f commit ce807fe

23 files changed

+664
-151
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
ignore-unfixed: "true"
234234

235235
- name: Upload Trivy scan results to GitHub Security tab
236-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
236+
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
237237
continue-on-error: true
238238
with:
239239
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ jobs:
264264
if: ${{ inputs.publish-image }}
265265

266266
- name: Upload Trivy scan results to GitHub Security tab
267-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
267+
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
268268
continue-on-error: true
269269
with:
270270
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
docker_md5: ${{ steps.vars.outputs.docker_md5 }}
4949
build_tag: ${{ steps.vars.outputs.build_tag }}
5050
stable_tag: ${{ steps.vars.outputs.stable_tag }}
51-
forked_workflow: ${{ (github.event.pull_request.head.repo.full_name != github.repository) && ! (startsWith(github.ref, 'refs/heads/release-') || github.ref_name == 'main') }}
51+
forked_workflow: ${{ steps.vars.outputs.forked_workflow }}
5252
steps:
5353
- name: Checkout Repository
5454
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -87,6 +87,7 @@ jobs:
8787
source .github/data/version.txt
8888
echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT
8989
echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT
90+
echo "forked_workflow=${{ (github.event.pull_request.head.repo.full_name != github.github.event.pull_request.base.repo.full_name) || github.repository != 'nginxinc/kubernetes-ingress' }}" >> $GITHUB_OUTPUT
9091
publish=false
9192
if ${{ github.event_name == 'workflow_dispatch' && inputs.publish-image }}; then
9293
publish=true
@@ -138,7 +139,7 @@ jobs:
138139
run: make cover
139140
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
140141
- name: Upload coverage to Codecov
141-
uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
142+
uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
142143
with:
143144
files: ./coverage.txt
144145
token: ${{ secrets.CODECOV_TOKEN }} # required

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
47+
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
6363
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
66+
uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
7676
# ./location_of_script_within_repo/buildscript.sh
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
79+
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
8080
with:
8181
category: "/language:${{matrix.language}}"

‎.github/workflows/create-release-branch.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: "Create release branch"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release_version:
7+
required: true
8+
type: string
9+
default: '0.0'
10+
source_branch:
11+
required: false
12+
type: string
13+
default: 'main'
14+
branch_prefix:
15+
required: false
16+
type: string
17+
default: 'release-'
18+
update:
19+
type: boolean
20+
default: false
21+
dry_run:
22+
type: boolean
23+
default: false
24+
25+
26+
defaults:
27+
run:
28+
shell: bash
29+
30+
permissions:
31+
contents: read
32+
33+
jobs:
34+
create:
35+
name: Create release branch
36+
runs-on: ubuntu-latest
37+
permissions:
38+
contents: write
39+
steps:
40+
- name: Checkout NIC repo
41+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
42+
with:
43+
ref: ${{ inputs.source_branch }}
44+
45+
- name: Create new release branch
46+
run: |
47+
branch="${{ inputs.branch_prefix }}${{ inputs.release_version }}"
48+
if git rev-parse --verify remotes/origin/${branch}; then
49+
git checkout ${branch}
50+
git pull
51+
if ${{ inputs.update }}; then
52+
echo "Updating from ${{ inputs.source_branch }}."
53+
git merge -Xtheirs ${{ inputs.source_branch }} -m "chore: Merge branch ${{ inputs.source_branch }} into ${branch}"
54+
else
55+
echo "UPDATE not requested. Not making any changes"
56+
fi
57+
else
58+
git checkout -b ${branch}
59+
fi
60+
61+
echo "Pushing to branch $branch"
62+
if ! ${{ inputs.dry_run }}; then
63+
git push origin "${branch}"
64+
else
65+
echo "DRY RUN not making any changes"
66+
git push --dry-run origin "${branch}"
67+
fi
68+
env:
69+
GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}

‎.github/workflows/create-release-tag.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: "Create Tag on release branch"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release_branch:
7+
required: true
8+
type: string
9+
default: 'release-0.0'
10+
tag:
11+
required: false
12+
type: string
13+
default: 'vx.x.x'
14+
dry_run:
15+
type: boolean
16+
default: false
17+
18+
19+
defaults:
20+
run:
21+
shell: bash
22+
23+
permissions:
24+
contents: read
25+
26+
jobs:
27+
create:
28+
name: Create Tag on release branch in NIC repo
29+
runs-on: ubuntu-latest
30+
permissions:
31+
contents: write
32+
steps:
33+
- name: Checkout NIC repo
34+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
35+
with:
36+
ref: ${{ inputs.release_branch }}
37+
38+
- name: Create new release Tag
39+
run: |
40+
branch="${{ inputs.release_branch }}"
41+
tag="${{ inputs.tag }}"
42+
if git rev-parse --verify refs/tags/${tag}; then
43+
echo "Adding tag ${tag}."
44+
git tag -a ${tag} -m "Version ${tag#v*}"
45+
echo "Pushing to tag ${tag} to branch ${branch}"
46+
if ! ${{ inputs.dry_run }}; then
47+
git push origin "${tag}"
48+
else
49+
echo "DRY RUN not making any changes"
50+
git push --dry-run origin "${tag}"
51+
fi
52+
else
53+
echo "Warning: Tag ${tag} already exists. Not making any changes"
54+
fi
55+
env:
56+
GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}

‎.github/workflows/scorecards.yml‎

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

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
60+
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
6161
with:
6262
sarif_file: results.sarif

‎.github/workflows/version-bump.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: "Bump the IC & Helm chart version"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
source_branch:
7+
required: true
8+
type: string
9+
default: 'main'
10+
ic_version:
11+
required: true
12+
type: string
13+
default: '0.0.0'
14+
helm_chart_version:
15+
required: true
16+
type: string
17+
default: '0.0.0'
18+
19+
defaults:
20+
run:
21+
shell: bash
22+
23+
permissions:
24+
contents: read
25+
26+
jobs:
27+
version-bump:
28+
permissions:
29+
contents: write
30+
runs-on: ubuntu-22.04
31+
steps:
32+
- name: Checkout Repository
33+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
34+
with:
35+
ref: ${{ inputs.source_branch }}
36+
37+
- name: Replace Versions
38+
run: |
39+
yq -i e '.version = env(CHART_VERSION) | .appVersion = env(IC_VERSION)' kubernetes-ingress/charts/nginx-ingress/Chart.yaml
40+
cat kubernetes-ingress/charts/nginx-ingress/Chart.yaml
41+
cat > kubernetes-ingress/.github/data/version.txt << EOF
42+
IC_VERSION=${IC_VERSION}
43+
HELM_CHART_VERSION=${CHART_VERSION}
44+
EOF
45+
cat kubernetes-ingress/.github/data/version.txt
46+
env:
47+
IC_VERSION: ${{ inputs.ic_version }}
48+
CHART_VERSION: ${{ inputs.helm_chart_version }}
49+
50+
- name: Create Pull Request
51+
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
52+
with:
53+
token: ${{ secrets.NGINX_PAT }}
54+
commit-message: Version Bump for ${{ github.event.inputs.ic_version }}
55+
title: Version Bump for ${{ github.event.inputs.ic_version }}
56+
branch: chore/version-bump-${{ github.event.inputs.ic_version }}
57+
author: nginx-bot <integrations@nginx.com>
58+
labels: chore
59+
body: |
60+
This automated PR updates the NIC & Helm chart versions for the upcoming ${{ github.event.inputs.ic_version }} release.

‎docs/content/installation/nic-images/pulling-ingress-controller-image.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ To pull an image, follow these steps. Replace `<version-tag>` with the specific
6060
docker pull private-registry.nginx.com/nginx-ic-dos/nginx-plus-ingress:<version-tag>
6161
```
6262

63+
- For NGINX Plus Ingress Controller with NGINX App Protect WAF and DoS, run:
64+
65+
```shell
66+
docker pull private-registry.nginx.com/nginx-ic-nap-dos/nginx-plus-ingress:<version-tag>
67+
```
68+
6369
You can use the Docker registry API to list the available image tags by running the following commands. Replace `<path-to-client.key>` with the location of your client key and `<path-to-client.cert>` with the location of your client certificate. The `jq` command is used to format the JSON output for easier reading.
6470

6571
```json

‎docs/content/tutorials/security-monitoring.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This guide assumes that you have an installation of NGINX Instance Manager with
1414

1515
If you use custom container images, NGINX Agent must be installed along with NGINX App Protect WAF. See the [Dockerfile](https://github.com/nginxinc/kubernetes-ingress/tree/v3.5.0/build/Dockerfile) for examples of how to install NGINX Agent or the [NGINX Agent installation documentation](https://docs.nginx.com/nginx-agent/installation-upgrade/) for more information.
1616

17-
## Deploying NGINX Ingress Controller with GlobalConfiguration resource
17+
## Deploying NGINX Ingress Controller with NGINX Agent configuration
1818

1919
{{<tabs name="deploy-config-resource">}}
2020

0 commit comments

Comments
 (0)
0