Skip to content

Commit 728139f

Browse files
SkceySkcey
authored
Merge branch 'main' into feature/tcproute-udproute
2 parents 7a6c74d + 8e779fc commit 728139f

File tree

248 files changed

+3712
-1497
lines changed

Some content is hidden

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

248 files changed

+3712
-1497
lines changed

‎.github/workflows/build.yml‎

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

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
85+
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
@@ -163,15 +163,15 @@ jobs:
163163
164164
- name: Scan SBOM
165165
id: scan
166-
uses: anchore/scan-action@16910ac423301c6d30554b83a7f71ac6ff4a51f3 # v6.4.0
166+
uses: anchore/scan-action@df395807f4554463d4455b8047cf58e37b6acaae # v6.5.0
167167
with:
168168
sbom: "sbom-${{ inputs.image }}.json"
169169
only-fixed: true
170170
add-cpes-if-none: true
171171
fail-build: false
172172

173173
- name: Upload scan result to GitHub Security tab
174-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
174+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Output Variables
6060
id: vars
6161
run: |
62-
K8S_KIND_VERSION=v1.33.1 # renovate: datasource=docker depName=kindest/node
62+
K8S_KIND_VERSION=v1.33.2 # renovate: datasource=docker depName=kindest/node
6363
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
6464
echo "min_k8s_version=v1.25.16" >> $GITHUB_OUTPUT
6565
echo "k8s_latest=${K8S_KIND_VERSION}" >> $GITHUB_OUTPUT
@@ -149,7 +149,7 @@ jobs:
149149
.github/.cache/buster-for-binary
150150
151151
- name: Create/Update Draft
152-
uses: lucacome/draft-release@38def8b74645796e9743b53e0f187d4a8915ea3e # v1.2.3
152+
uses: lucacome/draft-release@00f74370c044c322da6cb52acc707d62c7762c71 # v1.2.4
153153
with:
154154
minor-label: "enhancement"
155155
major-label: "change"
@@ -161,17 +161,17 @@ jobs:
161161
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
162162

163163
- name: Download Syft
164-
uses: anchore/sbom-action/download-syft@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2
164+
uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
165165
if: github.ref_type == 'tag'
166166

167167
- name: Install Cosign
168-
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
168+
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
169169
if: github.ref_type == 'tag'
170170

171171
- name: Build binary
172172
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
173173
with:
174-
version: v2.11.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
174+
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
175175
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
176176
env:
177177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/conformance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Build binary
8080
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
8181
with:
82-
version: v2.11.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
82+
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
8383
args: build --single-target --snapshot --clean
8484
env:
8585
TELEMETRY_ENDPOINT: "" # disables sending telemetry

‎.github/workflows/functional.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: Build binary
7474
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
7575
with:
76-
version: v2.11.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
76+
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
7777
args: build --single-target --snapshot --clean
7878
env:
7979
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
4141
with:
4242
working-directory: ${{ matrix.directory }}
43-
version: v2.2.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
43+
version: v2.3.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
4444

4545
njs-lint:
4646
name: NJS Lint

‎.github/workflows/nfr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Authenticate to Google Cloud
8888
id: auth
89-
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
89+
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
9090
with:
9191
token_format: access_token
9292
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
@@ -100,7 +100,7 @@ jobs:
100100
password: ${{ steps.auth.outputs.access_token }}
101101

102102
- name: Set up Cloud SDK
103-
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
103+
uses: google-github-actions/setup-gcloud@6a7c903a70c8625ed6700fa299f5ddb4ca6022e9 # v2.1.5
104104
with:
105105
project_id: ${{ secrets.GCP_PROJECT_ID }}
106106
install_components: kubectl

‎.github/workflows/release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Get Release Notes
3737
id: notes
38-
uses: lucacome/draft-release@38def8b74645796e9743b53e0f187d4a8915ea3e # v1.2.3
38+
uses: lucacome/draft-release@00f74370c044c322da6cb52acc707d62c7762c71 # v1.2.4
3939
with:
4040
config-path: .github/release-notes.yml
4141
dry-run: true

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
63+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6464
with:
6565
sarif_file: results.sarif

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repos:
2727
exclude: (^examples/|^docs/|.*_test.go$)
2828

2929
- repo: https://github.com/gitleaks/gitleaks
30-
rev: v8.27.2
30+
rev: v8.28.0
3131
hooks:
3232
- id: gitleaks
3333

@@ -39,7 +39,7 @@ repos:
3939
- javascript
4040

4141
- repo: https://github.com/golangci/golangci-lint
42-
rev: v2.2.1
42+
rev: v2.3.0
4343
hooks:
4444
- id: golangci-lint-full
4545
name: golangci-lint-root

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2323

2424
# tools versions
2525
# renovate: datasource=github-tags depName=golangci/golangci-lint
26-
GOLANGCI_LINT_VERSION = v2.2.1
26+
GOLANGCI_LINT_VERSION = v2.3.0
2727
# renovate: datasource=docker depName=kindest/node
28-
KIND_K8S_VERSION = v1.33.1
28+
KIND_K8S_VERSION = v1.33.2
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs
3030
HELM_DOCS_VERSION = v1.14.2
3131
# renovate: datasource=github-tags depName=ahmetb/gen-crd-api-reference-docs
@@ -107,7 +107,7 @@ check-for-docker: ## Check if Docker is installed
107107
build: ## Build the binary
108108
ifeq (${TARGET},local)
109109
@go version || (code=$$?; printf "\033[0;31mError\033[0m: unable to build locally\n"; exit $$code)
110-
CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C $(SELF_DIR) -trimpath -a -ldflags "$(GO_LINKER_FLAGS)" $(ADDITIONAL_GO_BUILD_FLAGS) -o $(OUT_DIR)/gateway github.com/nginx/nginx-gateway-fabric/cmd/gateway
110+
CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C $(SELF_DIR) -trimpath -a -ldflags "$(GO_LINKER_FLAGS)" $(ADDITIONAL_GO_BUILD_FLAGS) -o $(OUT_DIR)/gateway github.com/nginx/nginx-gateway-fabric/v2/cmd/gateway
111111
endif
112112

113113
.PHONY: build-goreleaser
@@ -141,7 +141,7 @@ generate-manifests: ## Generate manifests using Helm.
141141
./scripts/generate-manifests.sh
142142

143143
generate-api-docs: ## Generate API docs
144-
go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/apis"
144+
go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/v2/apis"
145145

146146
.PHONY: generate-helm-docs
147147
generate-helm-docs: ## Generate the Helm chart documentation

0 commit comments

Comments
 (0)