From 0a953617005961d2c9ca4a991272f45a20ba5e73 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 12 Jul 2023 14:44:01 -0600 Subject: [PATCH 1/3] update to Go 1.19.11 Signed-off-by: Steve Kriss --- .github/workflows/build_daily.yaml | 2 +- .github/workflows/prbuild.yaml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml index da615f7c353..ed9d037fa3b 100644 --- a/.github/workflows/build_daily.yaml +++ b/.github/workflows/build_daily.yaml @@ -10,7 +10,7 @@ on: env: GOPROXY: https://proxy.golang.org/ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GO_VERSION: 1.19.8 + GO_VERSION: 1.19.11 jobs: e2e-envoy-xds: runs-on: ubuntu-latest diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index b84a62c5dba..f71807c0931 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -9,7 +9,7 @@ on: env: GOPROXY: https://proxy.golang.org/ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - GO_VERSION: 1.19.8 + GO_VERSION: 1.19.11 jobs: lint: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 66579e1304c..06b1e3329f5 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ endif IMAGE_PLATFORMS ?= linux/amd64,linux/arm64 # Base build image to use. -BUILD_BASE_IMAGE ?= golang:1.19.8 +BUILD_BASE_IMAGE ?= golang:1.19.11 # Enable build with CGO. BUILD_CGO_ENABLED ?= 0 From 6a4321c7d1a944f3fdfba6b061079ce07c040eb6 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 12 Jul 2023 14:46:03 -0600 Subject: [PATCH 2/3] fix codespell issues Signed-off-by: Steve Kriss --- changelogs/CHANGELOG-v1.20.0.md | 2 +- site/content/posts/2020-01-16-announcing-contour-1.1.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelogs/CHANGELOG-v1.20.0.md b/changelogs/CHANGELOG-v1.20.0.md index b5edbe78bff..f2375f1ac9a 100644 --- a/changelogs/CHANGELOG-v1.20.0.md +++ b/changelogs/CHANGELOG-v1.20.0.md @@ -195,7 +195,7 @@ This change should be a no-op for most users, however be sure to re-apply the re Adds a `Path` & `Prefix` field to the `HTTPProxy.Spec.Route.RequestRedirectPolicy` which allows for redirects to also specify the path or prefix to redirect to. When specified, an -HTTP 302 response will be sent to the requestor with the new path or prefix specified. +HTTP 302 response will be sent to the requester with the new path or prefix specified. _Note: Only one of path or prefix can be specified on a single route._ diff --git a/site/content/posts/2020-01-16-announcing-contour-1.1.md b/site/content/posts/2020-01-16-announcing-contour-1.1.md index 79cbec69355..9d178918754 100644 --- a/site/content/posts/2020-01-16-announcing-contour-1.1.md +++ b/site/content/posts/2020-01-16-announcing-contour-1.1.md @@ -24,7 +24,7 @@ The header request policy has the following configuration: The following example takes requests from `headers.projectcontour.io/` and applies the following logic: * Adds the header `X-Foo: bar` to any request before it is proxied to the Kubernetes service named `s1` and removes the header `X-Baz` -* After the request is processed by service `s1`, the response back to the requestor will have the header `X-Service-Name: s1` added and will remove the header `X-Internal-Secret` +* After the request is processed by service `s1`, the response back to the requester will have the header `X-Service-Name: s1` added and will remove the header `X-Internal-Secret` ```yaml apiVersion: projectcontour.io/v1 From 8bc9594a25b6c421f3f9f17a775adc99fa4d1d1f Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 12 Jul 2023 14:52:11 -0600 Subject: [PATCH 3/3] disable tools linting Signed-off-by: Steve Kriss --- .github/workflows/prbuild.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index f71807c0931..12428f63cb8 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -22,7 +22,9 @@ jobs: uses: golangci/golangci-lint-action@v3 with: version: v1.48.0 - args: --build-tags=e2e,conformance,gcp,oidc,tools,none + # TODO: re-enable linting tools package once https://github.com/projectcontour/contour/issues/5077 + # is resolved + args: --build-tags=e2e,conformance,gcp,oidc,none - uses: act10ns/slack@v1 with: status: ${{ job.status }}