Skip to content

Commit 8ff524b

Browse files
committed
Update go version to 1.23
Also updates module dependencies Signed-off-by: James Taylor <[email protected]>
1 parent 704101c commit 8ff524b

File tree

9 files changed

+142
-212
lines changed

9 files changed

+142
-212
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Fabric k8s builder",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bookworm",
6+
"image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm",
77

88
// Features to add to the dev container. More info: https://containers.dev/features.
99
"features": {

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Go
3434
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
3535
with:
36-
go-version: 1.22
36+
go-version: 1.23
3737

3838
- name: Build
3939
run: go build -v ./...

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
2727
with:
28-
go-version: 1.22
28+
go-version: 1.23
2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3030
- name: golangci-lint
3131
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG UBUNTU_VER=20.04
22
ARG HLF_VERSION=2.5
33

44
FROM ubuntu:${UBUNTU_VER} AS build
5-
ARG GO_VER=1.22.0
5+
ARG GO_VER=1.23.0
66
ENV GOPATH=/go
77

88
RUN apt update && apt install -y \

go.mod

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/hyperledger-labs/fabric-builder-k8s
22

3-
go 1.22.3
3+
go 1.23.0
44

5-
toolchain go1.22.10
5+
toolchain go1.23.4
66

77
require (
8-
github.com/onsi/ginkgo/v2 v2.22.0
9-
github.com/onsi/gomega v1.36.0
10-
github.com/otiai10/copy v1.14.0
8+
github.com/onsi/ginkgo/v2 v2.22.1
9+
github.com/onsi/gomega v1.36.2
10+
github.com/otiai10/copy v1.14.1
1111
github.com/rogpeppe/go-internal v1.13.1
12-
k8s.io/api v0.31.3
13-
k8s.io/apimachinery v0.31.3
14-
k8s.io/client-go v0.31.3
15-
sigs.k8s.io/e2e-framework v0.5.0
12+
k8s.io/api v0.32.1
13+
k8s.io/apimachinery v0.32.1
14+
k8s.io/client-go v0.32.1
15+
sigs.k8s.io/e2e-framework v0.6.0
1616
)
1717

1818
require (
@@ -22,30 +22,36 @@ require (
2222
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
2323
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2424
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
25-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
25+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2626
github.com/go-openapi/jsonreference v0.20.4 // indirect
27-
github.com/go-openapi/swag v0.22.9 // indirect
27+
github.com/go-openapi/swag v0.23.0 // indirect
2828
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2929
github.com/google/gnostic-models v0.6.8 // indirect
30-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
30+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
3131
github.com/google/uuid v1.6.0 // indirect
3232
github.com/gorilla/websocket v1.5.0 // indirect
33+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3334
github.com/josharian/intern v1.0.0 // indirect
3435
github.com/mailru/easyjson v0.7.7 // indirect
35-
github.com/moby/spdystream v0.4.0 // indirect
36+
github.com/moby/spdystream v0.5.0 // indirect
3637
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3738
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
39+
github.com/otiai10/mint v1.6.3 // indirect
3840
github.com/pkg/errors v0.9.1 // indirect
3941
github.com/prometheus/client_golang v1.19.1 // indirect
4042
github.com/prometheus/client_model v0.6.1 // indirect
4143
github.com/prometheus/common v0.55.0 // indirect
4244
github.com/prometheus/procfs v0.15.1 // indirect
43-
github.com/vladimirvivien/gexe v0.3.0 // indirect
45+
github.com/spf13/cobra v1.8.1 // indirect
46+
github.com/vladimirvivien/gexe v0.4.1 // indirect
4447
github.com/x448/float16 v0.8.4 // indirect
45-
golang.org/x/sync v0.8.0 // indirect
46-
golang.org/x/tools v0.26.0 // indirect
47-
k8s.io/component-base v0.31.1 // indirect
48-
sigs.k8s.io/controller-runtime v0.19.0 // indirect
48+
go.opentelemetry.io/otel v1.28.0 // indirect
49+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
50+
golang.org/x/sync v0.10.0 // indirect
51+
golang.org/x/tools v0.28.0 // indirect
52+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
53+
k8s.io/component-base v0.32.1 // indirect
54+
sigs.k8s.io/controller-runtime v0.20.0 // indirect
4955
)
5056

5157
require (
@@ -55,25 +61,23 @@ require (
5561
github.com/golang/protobuf v1.5.4 // indirect
5662
github.com/google/go-cmp v0.6.0 // indirect
5763
github.com/google/gofuzz v1.2.0 // indirect
58-
github.com/imdario/mergo v0.3.16 // indirect
5964
github.com/json-iterator/go v1.1.12 // indirect
6065
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6166
github.com/modern-go/reflect2 v1.0.2 // indirect
6267
github.com/spf13/pflag v1.0.5 // indirect
63-
golang.org/x/net v0.30.0 // indirect
64-
golang.org/x/oauth2 v0.21.0 // indirect
65-
golang.org/x/sys v0.26.0 // indirect
66-
golang.org/x/term v0.25.0 // indirect
67-
golang.org/x/text v0.19.0 // indirect
68-
golang.org/x/time v0.5.0 // indirect
69-
google.golang.org/protobuf v1.35.1 // indirect
68+
golang.org/x/net v0.33.0 // indirect
69+
golang.org/x/oauth2 v0.23.0 // indirect
70+
golang.org/x/sys v0.28.0 // indirect
71+
golang.org/x/term v0.27.0 // indirect
72+
golang.org/x/text v0.21.0 // indirect
73+
golang.org/x/time v0.7.0 // indirect
74+
google.golang.org/protobuf v1.36.1 // indirect
7075
gopkg.in/inf.v0 v0.9.1 // indirect
71-
gopkg.in/yaml.v2 v2.4.0 // indirect
7276
gopkg.in/yaml.v3 v3.0.1 // indirect
7377
k8s.io/klog/v2 v2.130.1 // indirect
74-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
75-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
76-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
77-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
78+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
79+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
80+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
81+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
7882
sigs.k8s.io/yaml v1.4.0 // indirect
7983
)

0 commit comments

Comments
 (0)