Skip to content

Commit 19299de

Browse files
authored
Merge pull request #1449 from cpanato/updates
Dependency updates and update Go
2 parents 3bfe95a + e5fdb3f commit 19299de

File tree

5 files changed

+124
-134
lines changed

5 files changed

+124
-134
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,6 @@ updates:
2424
- "minor"
2525
- "patch"
2626

27-
- package-ecosystem: "docker"
28-
directory: "/"
29-
schedule:
30-
interval: daily
31-
labels:
32-
- "area/dependency"
33-
- "release-note-none"
34-
- "ok-to-test"
35-
groups:
36-
all:
37-
update-types:
38-
- "minor"
39-
- "patch"
40-
4127
- package-ecosystem: "github-actions"
4228
directory: "/"
4329
schedule:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
2020
with:
21-
go-version: "1.22"
21+
go-version: "1.23"
2222
check-latest: true
2323
cache: false
2424

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.22.11@sha256:d5b17d684180648e16ea974bea677498945e8b619f7b26325958d8d99e97f9ea as builder
16+
FROM golang:1.23.7@sha256:7fb9682dbc6c9743cd911cedb39c84790e8dfeaaf87d229b78f3f6658fce507a as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

go.mod

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
module sigs.k8s.io/cluster-api-provider-gcp
22

3-
go 1.22.0
3+
go 1.23.7
44

55
require (
6-
cloud.google.com/go/compute v1.31.1
7-
cloud.google.com/go/container v1.42.0
8-
cloud.google.com/go/iam v1.2.2
9-
cloud.google.com/go/resourcemanager v1.10.2
6+
cloud.google.com/go/compute v1.34.1
7+
cloud.google.com/go/container v1.42.2
8+
cloud.google.com/go/iam v1.4.0
9+
cloud.google.com/go/resourcemanager v1.10.3
1010
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.33.0
1111
github.com/go-logr/logr v1.4.2
12-
github.com/google/go-cmp v0.6.0
13-
github.com/googleapis/gax-go/v2 v2.14.0
14-
github.com/onsi/ginkgo/v2 v2.22.2
12+
github.com/google/go-cmp v0.7.0
13+
github.com/googleapis/gax-go/v2 v2.14.1
14+
github.com/onsi/ginkgo/v2 v2.23.0
1515
github.com/onsi/gomega v1.36.2
1616
github.com/pkg/errors v0.9.1
17-
github.com/spf13/pflag v1.0.5
17+
github.com/spf13/pflag v1.0.6
1818
github.com/stretchr/testify v1.10.0
19-
golang.org/x/crypto v0.32.0
20-
golang.org/x/mod v0.22.0
21-
golang.org/x/net v0.34.0
22-
google.golang.org/api v0.214.0
23-
google.golang.org/grpc v1.67.3
19+
golang.org/x/crypto v0.36.0
20+
golang.org/x/mod v0.23.0
21+
golang.org/x/net v0.37.0
22+
google.golang.org/api v0.224.0
23+
google.golang.org/grpc v1.71.0
2424
k8s.io/api v0.31.3
2525
k8s.io/apimachinery v0.31.3
2626
k8s.io/client-go v0.31.3
2727
k8s.io/component-base v0.31.3
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
30-
sigs.k8s.io/cluster-api v1.9.4
30+
sigs.k8s.io/cluster-api v1.9.6
3131
sigs.k8s.io/cluster-api/test v1.9.4
32-
sigs.k8s.io/controller-runtime v0.19.4
32+
sigs.k8s.io/controller-runtime v0.19.6
3333
)
3434

3535
require (
36-
cloud.google.com/go v0.116.0 // indirect
37-
cloud.google.com/go/auth v0.13.0 // indirect
38-
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
39-
cloud.google.com/go/longrunning v0.6.2 // indirect
36+
cloud.google.com/go v0.118.3 // indirect
37+
cloud.google.com/go/auth v0.15.0 // indirect
38+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
39+
cloud.google.com/go/longrunning v0.6.4 // indirect
4040
dario.cat/mergo v1.0.1 // indirect
4141
github.com/NYTimes/gziphandler v1.1.1 // indirect
4242
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
@@ -58,17 +58,18 @@ require (
5858
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
5959
github.com/sourcegraph/conc v0.3.0 // indirect
6060
github.com/x448/float16 v0.8.4 // indirect
61-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
62-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
63-
go.opentelemetry.io/otel v1.29.0 // indirect
61+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
62+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
63+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
64+
go.opentelemetry.io/otel v1.34.0 // indirect
6465
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
6566
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
66-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
67-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
68-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
67+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
68+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
69+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
6970
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7071
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
71-
golang.org/x/sync v0.10.0 // indirect
72+
golang.org/x/sync v0.12.0 // indirect
7273
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7374
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
7475
)
@@ -107,10 +108,10 @@ require (
107108
github.com/google/go-querystring v1.1.0 // indirect
108109
github.com/google/gofuzz v1.2.0 // indirect
109110
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
110-
github.com/google/s2a-go v0.1.8 // indirect
111+
github.com/google/s2a-go v0.1.9 // indirect
111112
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
112113
github.com/google/uuid v1.6.0 // indirect
113-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
114+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
114115
github.com/hashicorp/hcl v1.0.0 // indirect
115116
github.com/huandu/xstrings v1.5.0 // indirect
116117
github.com/imdario/mergo v0.3.13 // indirect
@@ -145,17 +146,17 @@ require (
145146
github.com/valyala/fastjson v1.6.4 // indirect
146147
go.uber.org/multierr v1.11.0 // indirect
147148
go.uber.org/zap v1.27.0 // indirect; indirect// indirect
148-
golang.org/x/oauth2 v0.24.0 // indirect
149-
golang.org/x/sys v0.29.0 // indirect
150-
golang.org/x/term v0.28.0 // indirect
151-
golang.org/x/text v0.21.0 // indirect
152-
golang.org/x/time v0.8.0 // indirect
153-
golang.org/x/tools v0.28.0 // indirect
149+
golang.org/x/oauth2 v0.27.0 // indirect
150+
golang.org/x/sys v0.31.0 // indirect
151+
golang.org/x/term v0.30.0 // indirect
152+
golang.org/x/text v0.23.0 // indirect
153+
golang.org/x/time v0.10.0 // indirect
154+
golang.org/x/tools v0.30.0 // indirect
154155
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
155-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
156-
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
157-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
158-
google.golang.org/protobuf v1.36.1 // indirect
156+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
157+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
158+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
159+
google.golang.org/protobuf v1.36.5 // indirect
159160
gopkg.in/inf.v0 v0.9.1 // indirect
160161
gopkg.in/ini.v1 v1.67.0 // indirect
161162
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)