Sitelet https://github.com/kubernetes/kops/commit/42734211fbc0a6df39a2137352187ed1ba6b2ec6
Skip to content

Commit 4273421

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #18205 from hakman/automated-cherry-pick-of-#18173-upstream-release-1.35
Automated cherry pick of #18173: Update Golang to 1.25.9
2 parents ceb14a5 + 106173b commit 4273421

16 files changed

Lines changed: 25 additions & 98 deletions

File tree

‎cloudbuild.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
machineType: "E2_HIGHCPU_32"
66
steps:
77
# Push the images
8-
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
8+
- name: "mirror.gcr.io/library/golang:1.25.9-trixie"
99
id: images
1010
entrypoint: make
1111
env:
@@ -22,7 +22,7 @@ steps:
2222
- kube-apiserver-healthcheck-push
2323
- discovery-server-push
2424
# Push the artifacts
25-
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
25+
- name: "mirror.gcr.io/library/golang:1.25.9-trixie"
2626
id: artifacts
2727
entrypoint: make
2828
env:
@@ -37,7 +37,7 @@ steps:
3737
args:
3838
- gcs-upload-and-tag
3939
# Build cloudbuild artifacts (for attestation)
40-
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
40+
- name: "mirror.gcr.io/library/golang:1.25.9-trixie"
4141
id: cloudbuild-artifacts
4242
entrypoint: make
4343
env:

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module k8s.io/kops
22

33
// This should be kept in sync with cloudbuild.yaml and the other go.mod files
4-
go 1.25.8
4+
go 1.25.9
55

66
godebug default=go1.25
77

@@ -75,7 +75,7 @@ require (
7575
golang.org/x/net v0.52.0
7676
golang.org/x/oauth2 v0.36.0
7777
golang.org/x/sync v0.20.0
78-
golang.org/x/sys v0.42.0
78+
golang.org/x/sys v0.43.0
7979
google.golang.org/api v0.257.0
8080
google.golang.org/grpc v1.77.0
8181
google.golang.org/protobuf v1.36.11

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc
718718
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
719719
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
720720
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
721-
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
722-
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
721+
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
722+
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
723723
golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
724724
golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
725725
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎hack/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/hack
22

3-
go 1.25.8
3+
go 1.25.9
44

55
tool (
66
github.com/client9/misspell/cmd/misspell

‎tests/e2e/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/tests/e2e
22

3-
go 1.25.8
3+
go 1.25.9
44

55
replace k8s.io/kops => ../../.
66

@@ -320,7 +320,7 @@ require (
320320
golang.org/x/net v0.52.0 // indirect
321321
golang.org/x/oauth2 v0.36.0 // indirect
322322
golang.org/x/sync v0.20.0 // indirect
323-
golang.org/x/sys v0.42.0 // indirect
323+
golang.org/x/sys v0.43.0 // indirect
324324
golang.org/x/term v0.41.0 // indirect
325325
golang.org/x/text v0.35.0 // indirect
326326
golang.org/x/time v0.14.0 // indirect

‎tests/e2e/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,8 +1140,8 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11401140
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11411141
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11421142
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1143-
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
1144-
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
1143+
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
1144+
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
11451145
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
11461146
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
11471147
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎tools/metal/dhcp/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes/kops/tools/metal/dhcp
22

3-
go 1.25.8
3+
go 1.25.9
44

55
require github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5
66

‎tools/metal/storage/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes/kops/tools/metal/dhcp
22

3-
go 1.25.8
3+
go 1.25.9
44

55
require (
66
google.golang.org/grpc v1.66.0

‎tools/metal/storage/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
66
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
77
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
88
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
9-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
10-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
119
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
1210
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
1311
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=

‎tools/otel/traceserver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/tools/otel/traceserver
22

3-
go 1.25.8
3+
go 1.25.9
44

55
require (
66
go.opentelemetry.io/proto/otlp v1.9.0

0 commit comments

Comments
 (0)