Skip to content

Commit 2d30681

Browse files
miledxzmiledxz
authored
Merge branch 'nginxinc:main' into test/add-runtime-manager-tests
2 parents 837770a + ee4319c commit 2d30681

File tree

208 files changed

+4299
-2448
lines changed

Some content is hidden

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

208 files changed

+4299
-2448
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- 5000:5000
3636
steps:
3737
- name: Checkout Repository
38-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
38+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3939
with:
4040
ref: ${{ inputs.tag != '' && format('refs/tags/v{0}', inputs.tag) || github.ref }}
4141

@@ -152,7 +152,7 @@ jobs:
152152
fail-build: false
153153

154154
- name: Upload scan result to GitHub Security tab
155-
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
155+
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
156156
continue-on-error: true
157157
with:
158158
sarif_file: ${{ steps.scan.outputs.sarif }}

‎.github/workflows/ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
min_k8s_version: ${{ steps.vars.outputs.min_k8s_version }}
3232
steps:
3333
- name: Checkout Repository
34-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
34+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3535

3636
- name: Setup Golang Environment
3737
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -62,7 +62,7 @@ jobs:
6262
needs: vars
6363
steps:
6464
- name: Checkout Repository
65-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
65+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
6666

6767
- name: Setup Golang Environment
6868
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -73,7 +73,7 @@ jobs:
7373
run: make unit-test
7474

7575
- name: Upload coverage reports to Codecov
76-
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
76+
uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
7777
with:
7878
token: ${{ secrets.CODECOV_TOKEN }}
7979

@@ -90,7 +90,7 @@ jobs:
9090
needs: vars
9191
steps:
9292
- name: Checkout Repository
93-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
93+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
9494

9595
- name: Setup Node.js Environment
9696
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
@@ -101,7 +101,7 @@ jobs:
101101
run: npm --prefix ${{ github.workspace }}/internal/mode/static/nginx/modules install-ci-test
102102

103103
- name: Upload coverage reports to Codecov
104-
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
104+
uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
105105
with:
106106
token: ${{ secrets.CODECOV_TOKEN }}
107107

@@ -115,7 +115,7 @@ jobs:
115115
issues: write # for goreleaser/goreleaser-action to close milestone
116116
steps:
117117
- name: Checkout Repository
118-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
118+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
119119
with:
120120
fetch-depth: 0
121121

@@ -145,7 +145,7 @@ jobs:
145145
if: github.ref_type == 'tag'
146146

147147
- name: Build binary
148-
uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
148+
uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0
149149
with:
150150
version: latest
151151
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
@@ -236,7 +236,7 @@ jobs:
236236
needs: [vars, build-oss]
237237
steps:
238238
- name: Checkout Repository
239-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
239+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
240240

241241
- name: Fetch Cached Artifacts
242242
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
@@ -303,7 +303,7 @@ jobs:
303303
make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
304304
echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
305305
kind load docker-image ghcr.io/nginxinc/nginx-gateway-fabric:${{ steps.ngf-meta.outputs.version }} ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ steps.nginx-meta.outputs.version }}
306-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.0.0/standard-install.yaml
306+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.1.0/standard-install.yaml
307307
308308
- name: Install Chart
309309
run: >
@@ -333,7 +333,7 @@ jobs:
333333
packages: write # for helm to push to GHCR
334334
steps:
335335
- name: Checkout Repository
336-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
336+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
337337

338338
- name: Login to GitHub Container Registry
339339
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

‎.github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
43+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
47+
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
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@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
66+
uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
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@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
79+
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
8080
with:
8181
category: "/language:${{matrix.language}}"

‎.github/workflows/conformance.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
contents: write # needed for uploading release artifacts
2929
steps:
3030
- name: Checkout Repository
31-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
31+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3232

3333
- name: Setup Golang Environment
3434
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -75,7 +75,7 @@ jobs:
7575
working-directory: ./conformance
7676

7777
- name: Build binary
78-
uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
78+
uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0
7979
with:
8080
version: latest
8181
args: build --snapshot --clean
@@ -153,5 +153,5 @@ jobs:
153153
if: ${{ inputs.k8s-version == 'latest' && startsWith(github.ref, 'refs/tags/') }}
154154
env:
155155
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
156-
run: gh release upload ${{ github.ref_name }} conformance-profile.yaml
156+
run: gh release upload ${{ github.ref_name }} conformance-profile.yaml --clobber
157157
working-directory: ./conformance

‎.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
steps:
1414
- name: "Checkout Repository"
15-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
15+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1616

1717
- name: "Dependency Review"
1818
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

‎.github/workflows/fossa.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: ${{ github.event.repository.fork == false }}
2020
steps:
2121
- name: Checkout Repository
22-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
22+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2323

2424
- name: Scan
2525
uses: fossas/fossa-action@47ef11b1e1e3812e88dae436ccbd2d0cbd1adab0 # v1.3.3

‎.github/workflows/functional.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-22.04
2424
steps:
2525
- name: Checkout Repository
26-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
26+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2727

2828
- name: Setup Golang Environment
2929
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -63,7 +63,7 @@ jobs:
6363
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
6464
6565
- name: Build binary
66-
uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
66+
uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0
6767
with:
6868
version: latest
6969
args: build --snapshot --clean

‎.github/workflows/lint.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
runs-on: ubuntu-22.04
2424
steps:
2525
- name: Checkout Repository
26-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
26+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2727

2828
- name: Setup Golang Environment
2929
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3030
with:
3131
go-version: stable
3232

3333
- name: Lint Code
34-
uses: golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc # v5.1.0
34+
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
3535
with:
3636
args: --timeout 10m0s
3737

@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-22.04
4141
steps:
4242
- name: Checkout Repository
43-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
43+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4444

4545
- name: Get Prettier version
4646
id: prettier-version
@@ -73,9 +73,9 @@ jobs:
7373
runs-on: ubuntu-22.04
7474
steps:
7575
- name: Checkout Repository
76-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
76+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
7777

78-
- uses: reviewdog/action-actionlint@51bfb044ddaed55059d16f14daedbe05a9937dc1 # v1.45.0
78+
- uses: reviewdog/action-actionlint@89a03f6ba8c0a9fd238e82c075ffb34b86e40291 # v1.46.0
7979
with:
8080
actionlint_flags: -shellcheck ""
8181

@@ -84,7 +84,7 @@ jobs:
8484
runs-on: ubuntu-22.04
8585
steps:
8686
- name: Checkout Repository
87-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
87+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
8888

8989
- uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
9090
with:
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-22.04
9797
steps:
9898
- name: Checkout Repository
99-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
99+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
100100
- name: Lint chart
101101
run: make lint-helm
102102

@@ -105,7 +105,7 @@ jobs:
105105
runs-on: ubuntu-22.04
106106
steps:
107107
- name: Checkout Repository
108-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
108+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
109109

110110
- name: Install yamllint
111111
run: pip install yamllint

‎.github/workflows/mend.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
if: ${{ github.event.repository.fork == false }}
2525
steps:
2626
- name: Checkout Repository
27-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
27+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2828
- name: Download agent
2929
run: curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
3030
- name: Verify JAR

‎.github/workflows/nfr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout Repository
48-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
48+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4949

5050
- name: Setup Golang Environment
5151
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Authenticate to Google Cloud
7373
id: auth
74-
uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c # v2.1.2
74+
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3
7575
with:
7676
token_format: access_token
7777
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}

‎.github/workflows/release-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "branch=release-$version" >> $GITHUB_OUTPUT
2828
2929
- name: Checkout Repository
30-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
30+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3131
with:
3232
ref: ${{ steps.branch.outputs.branch }}
3333

‎.github/workflows/scorecards.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929

3030
steps:
3131
- name: "Checkout code"
32-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
32+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3333
with:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
37+
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
63+
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
6464
with:
6565
sarif_file: results.sarif

‎.github/workflows/update-docker-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
nginx_version: ${{ steps.nginx.outputs.nginx_version }}
2525
steps:
2626
- name: Checkout Repository
27-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
27+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2828
with:
2929
fetch-depth: 0
3030

@@ -35,7 +35,7 @@ jobs:
3535
echo "tag=${tag//v}" >> $GITHUB_OUTPUT
3636
3737
- name: Checkout Repository at ${{ steps.ngf.outputs.tag }}
38-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
38+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3939
with:
4040
ref: refs/tags/v${{ steps.ngf.outputs.tag }}
4141

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repos:
3838
- javascript
3939

4040
- repo: https://github.com/golangci/golangci-lint
41-
rev: v1.57.2
41+
rev: v1.58.1
4242
hooks:
4343
- id: golangci-lint-full
4444

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TELEMETRY_REPORT_PERIOD = 24h
1515
TELEMETRY_ENDPOINT=# if empty, NGF will report telemetry in its logs at debug level.
1616
TELEMETRY_ENDPOINT_INSECURE = false
1717

18-
GW_API_VERSION = 1.0.0
18+
GW_API_VERSION = 1.1.0
1919
ENABLE_EXPERIMENTAL = false
2020
NODE_VERSION = $(shell cat .nvmrc)
2121

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6666

6767
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus |
6868
| -------------------- | ----------- | ---------- | --------- | ---------- |
69-
| Edge | 1.0.0 | 1.25+ | 1.25.5 | R31 |
69+
| Edge | 1.1.0 | 1.25+ | 1.25.5 | R31 |
7070
| 1.2.0 | 1.0.0 | 1.23+ | 1.25.4 | R31 |
7171
| 1.1.0 | 1.0.0 | 1.23+ | 1.25.3 | n/a |
7272
| 1.0.0 | 0.8.1 | 1.23+ | 1.25.2 | n/a |

‎apis/v1alpha1/clientsettingspolicy_types.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ type ClientSettingsPolicyList struct {
3636

3737
// ClientSettingsPolicySpec defines the desired state of ClientSettingsPolicy.
3838
type ClientSettingsPolicySpec struct {
39-
// TargetRef identifies an API object to apply the policy to.
40-
// Object must be in the same namespace as the policy.
41-
//
42-
// Support: Gateway, HTTPRoute
43-
TargetRef gatewayv1alpha2.PolicyTargetReference `json:"targetRef"`
44-
4539
// Body defines the client request body settings.
4640
//
4741
// +optional
@@ -51,6 +45,12 @@ type ClientSettingsPolicySpec struct {
5145
//
5246
// +optional
5347
KeepAlive *ClientKeepAlive `json:"keepAlive,omitempty"`
48+
49+
// TargetRef identifies an API object to apply the policy to.
50+
// Object must be in the same namespace as the policy.
51+
//
52+
// Support: Gateway, HTTPRoute
53+
TargetRef gatewayv1alpha2.LocalPolicyTargetReference `json:"targetRef"`
5454
}
5555

5656
// ClientBody contains the settings for the client request body.

0 commit comments

Comments
 (0)