From 34a117f4e94aa96161db15a079839745f9c6a912 Mon Sep 17 00:00:00 2001 From: zirain Date: Mon, 9 Sep 2024 11:49:36 +0800 Subject: [PATCH 1/3] ci: bump go 1.23 Signed-off-by: zirain --- examples/extension-server/go.mod | 2 +- examples/extension-server/tools/src/controller-gen/go.mod | 2 +- examples/kubernetes/ext-proc-grpc-service.yaml | 2 +- go.mod | 2 +- site/go.mod | 2 +- tools/github-actions/setup-deps/action.yaml | 2 +- tools/src/buf/go.mod | 2 +- tools/src/controller-gen/go.mod | 2 +- tools/src/crd-ref-docs/go.mod | 2 +- tools/src/gci/go.mod | 2 +- tools/src/golangci-lint/go.mod | 2 +- tools/src/helm-docs/go.mod | 2 +- tools/src/jb/go.mod | 2 +- tools/src/jsonnet/go.mod | 2 +- tools/src/kind/go.mod | 2 +- tools/src/protoc-gen-go-grpc/go.mod | 2 +- tools/src/protoc-gen-go/go.mod | 2 +- tools/src/setup-envtest/go.mod | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/extension-server/go.mod b/examples/extension-server/go.mod index 7fee44cb49b..2d81a9fc9ef 100644 --- a/examples/extension-server/go.mod +++ b/examples/extension-server/go.mod @@ -1,6 +1,6 @@ module github.com/exampleorg/envoygateway-extension -go 1.22.7 +go 1.23.1 require ( github.com/envoyproxy/gateway v1.0.2 diff --git a/examples/extension-server/tools/src/controller-gen/go.mod b/examples/extension-server/tools/src/controller-gen/go.mod index e1eab3409bc..f4a8bdac833 100644 --- a/examples/extension-server/tools/src/controller-gen/go.mod +++ b/examples/extension-server/tools/src/controller-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require sigs.k8s.io/controller-tools v0.15.0 diff --git a/examples/kubernetes/ext-proc-grpc-service.yaml b/examples/kubernetes/ext-proc-grpc-service.yaml index de94ccf905c..b52625d6a01 100644 --- a/examples/kubernetes/ext-proc-grpc-service.yaml +++ b/examples/kubernetes/ext-proc-grpc-service.yaml @@ -361,7 +361,7 @@ spec: - sh - "-c" - "cp -a /app /app-live && cd /app-live && go run . --certPath=/app-live/certs/ " - image: golang:1.22.7-alpine + image: golang:1.23.1-alpine ports: - containerPort: 8000 volumeMounts: diff --git a/go.mod b/go.mod index 4a9e67f46c3..5ee456faeb8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway -go 1.22.7 +go 1.23.1 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 diff --git a/site/go.mod b/site/go.mod index c6b0df811f3..4a41d4d7f70 100644 --- a/site/go.mod +++ b/site/go.mod @@ -1,6 +1,6 @@ module github.com/google/docsy-example -go 1.22.7 +go 1.23.1 require ( github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect diff --git a/tools/github-actions/setup-deps/action.yaml b/tools/github-actions/setup-deps/action.yaml index 16bd7db1c0c..7de23aac7ec 100644 --- a/tools/github-actions/setup-deps/action.yaml +++ b/tools/github-actions/setup-deps/action.yaml @@ -8,5 +8,5 @@ runs: run: sudo apt-get install libbtrfs-dev -y - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.1 with: - go-version: 1.22.x + go-version: 1.23.x cache: true diff --git a/tools/src/buf/go.mod b/tools/src/buf/go.mod index 78355ec355d..42c7457c733 100644 --- a/tools/src/buf/go.mod +++ b/tools/src/buf/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require github.com/bufbuild/buf v1.39.0 diff --git a/tools/src/controller-gen/go.mod b/tools/src/controller-gen/go.mod index f6d85a9431c..b8a96e8bbd0 100644 --- a/tools/src/controller-gen/go.mod +++ b/tools/src/controller-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require sigs.k8s.io/controller-tools v0.16.1 diff --git a/tools/src/crd-ref-docs/go.mod b/tools/src/crd-ref-docs/go.mod index 23b3153de03..53bb052d39b 100644 --- a/tools/src/crd-ref-docs/go.mod +++ b/tools/src/crd-ref-docs/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require github.com/elastic/crd-ref-docs v0.0.13-0.20240723135120-56876bccac3a diff --git a/tools/src/gci/go.mod b/tools/src/gci/go.mod index 7d4fd7ca6d3..382ffae2274 100644 --- a/tools/src/gci/go.mod +++ b/tools/src/gci/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require github.com/daixiang0/gci v0.13.4 diff --git a/tools/src/golangci-lint/go.mod b/tools/src/golangci-lint/go.mod index 4f356da5578..729ea86717c 100644 --- a/tools/src/golangci-lint/go.mod +++ b/tools/src/golangci-lint/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require github.com/golangci/golangci-lint v1.60.3 diff --git a/tools/src/helm-docs/go.mod b/tools/src/helm-docs/go.mod index 84484217b90..2f61f2bf33a 100644 --- a/tools/src/helm-docs/go.mod +++ b/tools/src/helm-docs/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/helm-docs -go 1.22.7 +go 1.23.1 require github.com/norwoodj/helm-docs v1.14.2 diff --git a/tools/src/jb/go.mod b/tools/src/jb/go.mod index 4b500d8ac15..fb8807bab20 100644 --- a/tools/src/jb/go.mod +++ b/tools/src/jb/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/jb -go 1.22.7 +go 1.23.1 require github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 diff --git a/tools/src/jsonnet/go.mod b/tools/src/jsonnet/go.mod index 27537f28221..2cf5cfd4c7b 100644 --- a/tools/src/jsonnet/go.mod +++ b/tools/src/jsonnet/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/jsonnet -go 1.22.7 +go 1.23.1 require github.com/google/go-jsonnet v0.20.0 diff --git a/tools/src/kind/go.mod b/tools/src/kind/go.mod index f09cbf32196..969589cce84 100644 --- a/tools/src/kind/go.mod +++ b/tools/src/kind/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/kind -go 1.22.7 +go 1.23.1 require sigs.k8s.io/kind v0.24.0 diff --git a/tools/src/protoc-gen-go-grpc/go.mod b/tools/src/protoc-gen-go-grpc/go.mod index 1e73e1c5269..11e0bc567bd 100644 --- a/tools/src/protoc-gen-go-grpc/go.mod +++ b/tools/src/protoc-gen-go-grpc/go.mod @@ -1,6 +1,6 @@ module github.com/envoyproxy/gateway/tools/src/protoc-gen-go-grpc -go 1.22.7 +go 1.23.1 require google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 diff --git a/tools/src/protoc-gen-go/go.mod b/tools/src/protoc-gen-go/go.mod index e24ee052913..588c433426f 100644 --- a/tools/src/protoc-gen-go/go.mod +++ b/tools/src/protoc-gen-go/go.mod @@ -1,5 +1,5 @@ module github.com/envoyproxy/gateway/tools/src/protoc-gen-go -go 1.22.7 +go 1.23.1 require google.golang.org/protobuf v1.33.0 diff --git a/tools/src/setup-envtest/go.mod b/tools/src/setup-envtest/go.mod index 53668dc72b2..305e98b8e12 100644 --- a/tools/src/setup-envtest/go.mod +++ b/tools/src/setup-envtest/go.mod @@ -1,6 +1,6 @@ module local -go 1.22.7 +go 1.23.1 require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240423173400-ed81fa696dea From 660de71100af0185bd8f2348894efc48f6ea75f0 Mon Sep 17 00:00:00 2001 From: zirain Date: Tue, 10 Sep 2024 20:46:04 +0800 Subject: [PATCH 2/3] revert crd-ref-docs and controller-gen Signed-off-by: zirain --- examples/extension-server/tools/src/controller-gen/go.mod | 2 +- tools/src/controller-gen/go.mod | 2 +- tools/src/crd-ref-docs/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/extension-server/tools/src/controller-gen/go.mod b/examples/extension-server/tools/src/controller-gen/go.mod index f4a8bdac833..e1eab3409bc 100644 --- a/examples/extension-server/tools/src/controller-gen/go.mod +++ b/examples/extension-server/tools/src/controller-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.23.1 +go 1.22.7 require sigs.k8s.io/controller-tools v0.15.0 diff --git a/tools/src/controller-gen/go.mod b/tools/src/controller-gen/go.mod index b8a96e8bbd0..f6d85a9431c 100644 --- a/tools/src/controller-gen/go.mod +++ b/tools/src/controller-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.23.1 +go 1.22.7 require sigs.k8s.io/controller-tools v0.16.1 diff --git a/tools/src/crd-ref-docs/go.mod b/tools/src/crd-ref-docs/go.mod index 53bb052d39b..23b3153de03 100644 --- a/tools/src/crd-ref-docs/go.mod +++ b/tools/src/crd-ref-docs/go.mod @@ -1,6 +1,6 @@ module local -go 1.23.1 +go 1.22.7 require github.com/elastic/crd-ref-docs v0.0.13-0.20240723135120-56876bccac3a From 032781b42741250ac351d5c749eeef2490d768a3 Mon Sep 17 00:00:00 2001 From: zirain Date: Wed, 11 Sep 2024 11:32:30 +0800 Subject: [PATCH 3/3] fix CookieBasedSessionPersistence Signed-off-by: zirain --- test/e2e/tests/session_persistence.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/tests/session_persistence.go b/test/e2e/tests/session_persistence.go index 7c1d90880ab..0e6e9f73907 100644 --- a/test/e2e/tests/session_persistence.go +++ b/test/e2e/tests/session_persistence.go @@ -137,6 +137,7 @@ var CookieBasedSessionPersistenceTest = suite.ConformanceTest{ MaxAge: 10, Path: "/v2", HttpOnly: true, + Quoted: true, }, cmpopts.IgnoreFields(http.Cookie{}, "Value", "Raw"), // Ignore the value as it is random. ); diff != "" { t.Fatalf("unexpected cookie: %v", diff)