From ed44951a1936c66c0317454a590cbc6e2b4e017b Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 5 Apr 2024 09:32:29 -0400 Subject: [PATCH 1/2] chore: update to go 1.22.3 * Update our go.mod to use toolchain * Make sure dockerfiles are using pinned versions * Set the version to 1.22.3 --- experiments/composite/go.mod | 4 +++- experiments/compositions/composition/Dockerfile | 2 +- experiments/compositions/composition/Dockerfile.inline | 3 +-- experiments/compositions/composition/go.mod | 2 +- experiments/compositions/facade/Dockerfile | 2 +- experiments/compositions/facade/go.mod | 4 +++- go.mod | 4 +++- mockgcp/go.mod | 4 +++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/experiments/composite/go.mod b/experiments/composite/go.mod index 07a0b8a716..bf3f0a6401 100644 --- a/experiments/composite/go.mod +++ b/experiments/composite/go.mod @@ -1,3 +1,5 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/composite -go 1.21.5 +go 1.22 + +toolchain go1.22.3 diff --git a/experiments/compositions/composition/Dockerfile b/experiments/compositions/composition/Dockerfile index 5f2df7f2b9..ec6fdec9e2 100644 --- a/experiments/compositions/composition/Dockerfile +++ b/experiments/compositions/composition/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.22.3 as builder ARG TARGETOS ARG TARGETARCH diff --git a/experiments/compositions/composition/Dockerfile.inline b/experiments/compositions/composition/Dockerfile.inline index 342018caed..7b1d22d4bc 100644 --- a/experiments/compositions/composition/Dockerfile.inline +++ b/experiments/compositions/composition/Dockerfile.inline @@ -2,8 +2,7 @@ # ----------------- Build Container --------------------------- # Build the go app. -# Explicitly set to latest vs golang:1.22 -FROM golang:1.22 AS build-stage +FROM golang:1.22.3 AS build-stage # Set destination for COPY WORKDIR /go/src/app diff --git a/experiments/compositions/composition/go.mod b/experiments/compositions/composition/go.mod index 098425a0b3..9766ac7ab6 100644 --- a/experiments/compositions/composition/go.mod +++ b/experiments/compositions/composition/go.mod @@ -1,6 +1,6 @@ module google.com/composition -go 1.22.0 +go 1.22 toolchain go1.22.3 diff --git a/experiments/compositions/facade/Dockerfile b/experiments/compositions/facade/Dockerfile index 86676acac6..e157a0ef48 100644 --- a/experiments/compositions/facade/Dockerfile +++ b/experiments/compositions/facade/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.22.3 as builder ARG TARGETOS ARG TARGETARCH diff --git a/experiments/compositions/facade/go.mod b/experiments/compositions/facade/go.mod index d4f482ede6..1efa2bcd82 100644 --- a/experiments/compositions/facade/go.mod +++ b/experiments/compositions/facade/go.mod @@ -1,6 +1,8 @@ module facade -go 1.20 +go 1.22 + +toolchain go1.22.3 require ( k8s.io/apimachinery v0.28.3 diff --git a/go.mod b/go.mod index b93b50751f..4b7ee91319 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/GoogleCloudPlatform/k8s-config-connector -go 1.21.5 +go 1.22 + +toolchain go1.22.3 replace github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp => ./mockgcp diff --git a/mockgcp/go.mod b/mockgcp/go.mod index 44460e0f88..ef3ec24843 100644 --- a/mockgcp/go.mod +++ b/mockgcp/go.mod @@ -1,6 +1,8 @@ module github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp -go 1.21.5 +go 1.22 + +toolchain go1.22.3 require ( cloud.google.com/go/compute v1.23.0 From fb783277348083922f0f05ed7feafe51504c6ca2 Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 5 Apr 2024 11:49:43 -0400 Subject: [PATCH 2/2] chore: fix go vet error in tests This looks like it is now a blocker in 1.22.2 (?) --- config/tests/samples/create/harness.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config/tests/samples/create/harness.go b/config/tests/samples/create/harness.go index 5bff2ce6ad..07bf176cc7 100644 --- a/config/tests/samples/create/harness.go +++ b/config/tests/samples/create/harness.go @@ -16,6 +16,8 @@ package create import ( "context" + "errors" + "fmt" "net/http" "os" "path/filepath" @@ -237,19 +239,28 @@ func NewHarnessWithOptions(ctx context.Context, t *testing.T, opts *HarnessOptio } { var wg sync.WaitGroup + var errsMutex sync.Mutex + var errs []error + for i := range crds { crd := &crds[i] wg.Add(1) log.V(2).Info("loading crd", "name", crd.GetName()) + go func() { defer wg.Done() if err := h.client.Create(ctx, crd.DeepCopy()); err != nil { - h.Fatalf("error creating crd %v: %v", crd.GroupVersionKind(), err) + errsMutex.Lock() + defer errsMutex.Unlock() + errs = append(errs, fmt.Errorf("error creating crd %v: %w", crd.GroupVersionKind(), err)) } h.waitForCRDReady(crd) }() } wg.Wait() + if len(errs) != 0 { + h.Fatalf("error creating crds: %v", errors.Join(errs...)) + } } }