From d5b88f5ecc58d20350740d1df57d740871bbadba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:56:36 +0000 Subject: [PATCH 1/6] Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 (#2095) * Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 5.1.0 to 6.0.0. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/5742e2a039330cbb23ebf35f046f814d4c6ff811...286f3b13b1b49da4ac219696163fb8c1c93e1200) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update goreleaser config --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini --- .github/workflows/ci.yml | 2 +- .github/workflows/conformance.yml | 2 +- .github/workflows/functional.yml | 2 +- .goreleaser.yml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 297a2667d9..accef7c249 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,7 +164,7 @@ jobs: if: github.ref_type == 'tag' - name: Build binary - uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: version: latest args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index d6d3c1a3a3..b8398e7f71 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -77,7 +77,7 @@ jobs: working-directory: ./tests - name: Build binary - uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: version: latest args: build --snapshot --clean diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index dadd05e0f6..d24a1fc0e1 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -65,7 +65,7 @@ jobs: type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }} - name: Build binary - uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: version: latest args: build --snapshot --clean diff --git a/.goreleaser.yml b/.goreleaser.yml index 96ae8af317..395385aa6c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +version: 2 env: - CGO_ENABLED=0 @@ -26,7 +27,7 @@ builds: binary: gateway changelog: - skip: true + disable: true archives: - id: gateway From 521760b5f271b8b9b26dbb47c03eb72cf40249f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:15:43 +0000 Subject: [PATCH 2/6] Bump prettier from 3.3.0 to 3.3.1 in /internal/mode/static/nginx/modules (#2094) * Bump prettier from 3.3.0 to 3.3.1 in /internal/mode/static/nginx/modules Bumps [prettier](https://github.com/prettier/prettier) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.0...3.3.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update pre-commit --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini --- .pre-commit-config.yaml | 2 +- internal/mode/static/nginx/modules/package-lock.json | 8 ++++---- internal/mode/static/nginx/modules/package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40d1b31400..1872663eb0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: hooks: - id: prettier additional_dependencies: - - prettier@3.3.0 # https://github.com/pre-commit/pre-commit/issues/3133 + - prettier@3.3.1 # https://github.com/pre-commit/pre-commit/issues/3133 types: - javascript diff --git a/internal/mode/static/nginx/modules/package-lock.json b/internal/mode/static/nginx/modules/package-lock.json index 17abfea953..d1d4ae55a9 100644 --- a/internal/mode/static/nginx/modules/package-lock.json +++ b/internal/mode/static/nginx/modules/package-lock.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@vitest/coverage-v8": "^1.6.0", - "prettier": "3.3.0", + "prettier": "3.3.1", "vitest": "^1.5.3" } }, @@ -1527,9 +1527,9 @@ } }, "node_modules/prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", - "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", + "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/internal/mode/static/nginx/modules/package.json b/internal/mode/static/nginx/modules/package.json index b777ee5514..e9c0b79a72 100644 --- a/internal/mode/static/nginx/modules/package.json +++ b/internal/mode/static/nginx/modules/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@vitest/coverage-v8": "^1.6.0", - "prettier": "3.3.0", + "prettier": "3.3.1", "vitest": "^1.5.3" }, "type": "module" From 3674d4a7e091901723a43d999137350184343e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:25:00 +0000 Subject: [PATCH 3/6] Bump actions/dependency-review-action from 4.3.2 to 4.3.3 (#2098) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/0c155c5e8556a497adf53f2c18edabf945ed8e70...72eb03d02c7872a771aacd928f3123ac62ad6d3a) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 726388e124..cbcf8a3ffd 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: "Dependency Review" - uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2 + uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3 with: config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" From e0c12757780d973a60ac899d2c847cc964fa9024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:58:44 -0600 Subject: [PATCH 4/6] Bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 (#2099) * Bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.3 to 0.18.4. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.18.3...v0.18.4) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update tests deps --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini --- go.mod | 2 +- go.sum | 4 ++-- tests/go.mod | 2 +- tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 28f4bb1198..7c685cfcfc 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( k8s.io/apiextensions-apiserver v0.30.1 k8s.io/apimachinery v0.30.1 k8s.io/client-go v0.30.1 - sigs.k8s.io/controller-runtime v0.18.3 + sigs.k8s.io/controller-runtime v0.18.4 sigs.k8s.io/controller-tools v0.15.0 sigs.k8s.io/gateway-api v1.1.0 ) diff --git a/go.sum b/go.sum index d004c3550e..46185ed051 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,8 @@ k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 h1:Q8Z7VlGhcJgBHJHYugJ/K/ k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBGe9UyDahzs9zQzQ= k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4= -sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= +sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/controller-tools v0.15.0 h1:4dxdABXGDhIa68Fiwaif0vcu32xfwmgQ+w8p+5CxoAI= sigs.k8s.io/controller-tools v0.15.0/go.mod h1:8zUSS2T8Hx0APCNRhJWbS3CAQEbIxLa07khzh7pZmXM= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= diff --git a/tests/go.mod b/tests/go.mod index 340732c06d..de2d94554c 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -13,7 +13,7 @@ require ( k8s.io/apiextensions-apiserver v0.30.1 k8s.io/apimachinery v0.30.1 k8s.io/client-go v0.30.1 - sigs.k8s.io/controller-runtime v0.18.3 + sigs.k8s.io/controller-runtime v0.18.4 sigs.k8s.io/gateway-api v1.1.0 sigs.k8s.io/yaml v1.4.0 ) diff --git a/tests/go.sum b/tests/go.sum index e0d2d41333..c20eb05948 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -208,8 +208,8 @@ k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 h1:ao5hUqGhsqdm+bYbjH/pRkCs0unBG k8s.io/utils v0.0.0-20240423183400-0849a56e8f22/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4= -sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= +sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= From 23f75a4c9d30d986d6187be1d4f8f64a763e789e Mon Sep 17 00:00:00 2001 From: Saylor Berman Date: Wed, 5 Jun 2024 15:14:14 -0600 Subject: [PATCH 5/6] Fix GRPCRoute check in tests (#2100) Problem: When running the upgrade tests, the grpcroute check fails because they don't exist in the previous version of the API. Solution: Check that grpcroutes even exist first, don't return an error if they don't. --- tests/framework/resourcemanager.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/framework/resourcemanager.go b/tests/framework/resourcemanager.go index c7c231c69b..caae52e855 100644 --- a/tests/framework/resourcemanager.go +++ b/tests/framework/resourcemanager.go @@ -398,6 +398,13 @@ func (rm *ResourceManager) waitForHTTPRoutesToBeReady(ctx context.Context, names } func (rm *ResourceManager) waitForGRPCRoutesToBeReady(ctx context.Context, namespace string) error { + // First, check if grpcroute even exists for v1. If not, ignore. + var routeList v1.GRPCRouteList + err := rm.K8sClient.List(ctx, &routeList, client.InNamespace(namespace)) + if err != nil && strings.Contains(err.Error(), "no matches for kind") { + return nil + } + return wait.PollUntilContextCancel( ctx, 500*time.Millisecond, From c5f8dbe112ca1be261f73b9f5b4925cda3d5860a Mon Sep 17 00:00:00 2001 From: Saylor Berman Date: Wed, 5 Jun 2024 15:32:24 -0600 Subject: [PATCH 6/6] Add retries to tracing tests (#2101) Problem: The tracing tests are still flaky as to whether or not the traces properly show up. The issues isn't really know right now. Solution: Add retries to the test in an attempt to remediate the intermittent issue. --- tests/suite/tracing_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/suite/tracing_test.go b/tests/suite/tracing_test.go index 0e2168f140..dfe23d487e 100644 --- a/tests/suite/tracing_test.go +++ b/tests/suite/tracing_test.go @@ -23,7 +23,10 @@ import ( "github.com/nginxinc/nginx-gateway-fabric/tests/framework" ) -var _ = Describe("Tracing", Label("functional", "tracing"), func() { +// This test can be flaky when waiting to see traces show up in the collector logs. +// Sometimes they get there right away, sometimes it takes 30 seconds. Retries were +// added to attempt to mitigate the issue, but it didn't fix it 100% +var _ = Describe("Tracing", FlakeAttempts(2), Label("functional", "tracing"), func() { var ( files = []string{ "hello-world/apps.yaml",