Skip to content

Commit

Permalink
Merge pull request #1513 from justinsb/bump_golang_1_22_2
Browse files Browse the repository at this point in the history
chore: update to go 1.22.3
  • Loading branch information
google-oss-prow[bot] authored May 8, 2024
2 parents 39241eb + fb78327 commit d2ac619
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 10 deletions.
13 changes: 12 additions & 1 deletion config/tests/samples/create/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ package create

import (
"context"
"errors"
"fmt"
"net/http"
"os"
"path/filepath"
Expand Down Expand Up @@ -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...))
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion experiments/composite/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/composite

go 1.21.5
go 1.22

toolchain go1.22.3
2 changes: 1 addition & 1 deletion experiments/compositions/composition/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions experiments/compositions/composition/Dockerfile.inline
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/composition/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module google.com/composition

go 1.22.0
go 1.22

toolchain go1.22.3

Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/facade/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion experiments/compositions/facade/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module facade

go 1.20
go 1.22

toolchain go1.22.3

require (
k8s.io/apimachinery v0.28.3
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 3 additions & 1 deletion mockgcp/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d2ac619

Please sign in to comment.