Skip to content

Commit d1c7c02

Browse files
authored
Merge pull request #1320 from Ganiredi/v1.35.0
1.35.0 release
2 parents dc94f58 + 3739e68 commit d1c7c02

File tree

8 files changed

+391
-366
lines changed

8 files changed

+391
-366
lines changed

.ko.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
1+
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookworm.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.24.9
17+
ARG GOLANG_IMAGE=golang:1.25.5
1818

1919
# The distroless image on which the CPI manager image is built.
2020
#
2121
# Please do not use "latest". Explicit tags should be used to provide
2222
# deterministic builds. Follow what kubernetes uses to build
2323
# kube-controller-manager, for example for 1.23.x:
2424
# https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
25-
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.9-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookworm.0
2626

2727
################################################################################
2828
## BUILD STAGE ##

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OUTPUT ?= $(shell pwd)/_output
2626
INSTALL_PATH ?= $(OUTPUT)/bin
2727
LDFLAGS ?= -w -s -X k8s.io/component-base/version.gitVersion=$(VERSION) -X main.gitVersion=$(VERSION)
2828

29-
GOLANG_DIRECTIVE_VERSION ?= 1.24.0
29+
GOLANG_DIRECTIVE_VERSION ?= 1.25.0
3030
CURL_RETRIES ?= 3
3131

3232
# flags for ecr-credential-provider artifact promotion
@@ -186,6 +186,7 @@ test-e2e-latest-k8s: switch-to-latest-k8s e2e.test ko-build-local install-e2e-to
186186
BUILD_IMAGE=$(IMAGE) \
187187
BUILD_VERSION=$(VERSION) \
188188
INSTALL_PATH=$(INSTALL_PATH) \
189+
KOPS_DISCOVERY_STORE=s3://cloud-provider-aws-shared-e2e \
189190
GINKGO_FOCUS="\[cloud-provider-aws-e2e\]" \
190191
./hack/e2e/run.sh
191192

@@ -196,6 +197,7 @@ test-e2e: e2e.test docker-build-amd64 install-e2e-tools
196197
BUILD_IMAGE=$(IMAGE) \
197198
BUILD_VERSION=$(VERSION) \
198199
INSTALL_PATH=$(INSTALL_PATH) \
200+
KOPS_DISCOVERY_STORE=s3://cloud-provider-aws-shared-e2e \
199201
GINKGO_FOCUS="\[cloud-provider-aws-e2e\]" \
200202
./hack/e2e/run.sh
201203

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- --platform=linux/amd64,linux/arm64
1818
- .
1919
# Build cloudbuild artifacts (for attestation)
20-
- name: 'docker.io/library/golang:1.24.9-bookworm'
20+
- name: 'docker.io/library/golang:1.25.5-bookworm'
2121
id: cloudbuild-artifacts
2222
entrypoint: make
2323
env:

go.mod

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/cloud-provider-aws
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/Pallinder/go-randomdata v1.2.0
@@ -13,38 +13,39 @@ require (
1313
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
1414
github.com/aws/aws-sdk-go-v2/service/kms v1.41.0
1515
github.com/mitchellh/hashstructure/v2 v2.0.2
16-
github.com/onsi/ginkgo/v2 v2.23.0
17-
github.com/onsi/gomega v1.36.2
16+
github.com/onsi/ginkgo/v2 v2.27.2
17+
github.com/onsi/gomega v1.38.2
1818
github.com/samber/lo v1.49.1
19-
github.com/spf13/cobra v1.9.1
20-
github.com/spf13/pflag v1.0.6
21-
github.com/stretchr/testify v1.10.0
19+
github.com/spf13/cobra v1.10.0
20+
github.com/spf13/pflag v1.0.9
21+
github.com/stretchr/testify v1.11.1
2222
golang.org/x/time v0.11.0
2323
gopkg.in/gcfg.v1 v1.2.3
24-
k8s.io/api v0.34.0
25-
k8s.io/apimachinery v0.34.0
26-
k8s.io/client-go v0.34.0
27-
k8s.io/cloud-provider v0.34.0
28-
k8s.io/code-generator v0.34.0
29-
k8s.io/component-base v0.34.0
30-
k8s.io/controller-manager v0.34.0
24+
k8s.io/api v0.35.0
25+
k8s.io/apimachinery v0.35.0
26+
k8s.io/client-go v0.35.0
27+
k8s.io/cloud-provider v0.35.0
28+
k8s.io/code-generator v0.35.0
29+
k8s.io/component-base v0.35.0
30+
k8s.io/controller-manager v0.35.0
3131
k8s.io/klog/v2 v2.130.1
32-
k8s.io/kubelet v0.34.0
33-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32+
k8s.io/kubelet v0.35.0
33+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3434
sigs.k8s.io/controller-runtime v0.20.3
3535
)
3636

3737
require (
3838
cel.dev/expr v0.24.0 // indirect
39+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3940
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4041
github.com/google/btree v1.1.3 // indirect
41-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
42+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4243
github.com/kylelemons/godebug v1.1.0 // indirect
43-
github.com/prometheus/client_golang v1.22.0 // indirect
44+
github.com/prometheus/client_golang v1.23.2 // indirect
4445
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
45-
go.yaml.in/yaml/v2 v2.4.2 // indirect
46+
go.yaml.in/yaml/v2 v2.4.3 // indirect
4647
go.yaml.in/yaml/v3 v3.0.4 // indirect
47-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
48+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
4849
gopkg.in/inf.v0 v0.9.1 // indirect
4950
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5051
gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -80,7 +81,7 @@ require (
8081
github.com/felixge/httpsnoop v1.0.4 // indirect
8182
github.com/fsnotify/fsnotify v1.9.0 // indirect
8283
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
83-
github.com/go-logr/logr v1.4.2 // indirect
84+
github.com/go-logr/logr v1.4.3 // indirect
8485
github.com/go-logr/stdr v1.2.2 // indirect
8586
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8687
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -102,48 +103,47 @@ require (
102103
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
103104
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
104105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105-
github.com/pkg/errors v0.9.1 // indirect
106106
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
107-
github.com/prometheus/client_model v0.6.1 // indirect
108-
github.com/prometheus/common v0.62.0 // indirect
109-
github.com/prometheus/procfs v0.15.1 // indirect
107+
github.com/prometheus/client_model v0.6.2 // indirect
108+
github.com/prometheus/common v0.66.1 // indirect
109+
github.com/prometheus/procfs v0.16.1 // indirect
110110
github.com/stoewer/go-strcase v1.3.0 // indirect
111111
github.com/stretchr/objx v0.5.2 // indirect
112112
github.com/x448/float16 v0.8.4 // indirect
113-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
114-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
115-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
113+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
114+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
115+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
116116
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
117-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
118-
go.opentelemetry.io/otel v1.35.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
118+
go.opentelemetry.io/otel v1.36.0 // indirect
119119
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
120120
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
121-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
122-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
123-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
123+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
124124
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
125125
go.uber.org/multierr v1.11.0 // indirect
126126
go.uber.org/zap v1.27.0 // indirect
127-
golang.org/x/crypto v0.36.0 // indirect
127+
golang.org/x/crypto v0.45.0 // indirect
128128
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
129-
golang.org/x/mod v0.23.0 // indirect
130-
golang.org/x/net v0.38.0 // indirect
131-
golang.org/x/oauth2 v0.27.0 // indirect
132-
golang.org/x/sync v0.12.0
133-
golang.org/x/sys v0.31.0 // indirect
134-
golang.org/x/term v0.30.0 // indirect
135-
golang.org/x/text v0.23.0 // indirect
136-
golang.org/x/tools v0.30.0 // indirect
129+
golang.org/x/mod v0.29.0 // indirect
130+
golang.org/x/net v0.47.0 // indirect
131+
golang.org/x/oauth2 v0.30.0 // indirect
132+
golang.org/x/sync v0.18.0
133+
golang.org/x/sys v0.38.0 // indirect
134+
golang.org/x/term v0.37.0 // indirect
135+
golang.org/x/text v0.31.0 // indirect
136+
golang.org/x/tools v0.38.0 // indirect
137137
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
138-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
139-
google.golang.org/grpc v1.72.1 // indirect
140-
google.golang.org/protobuf v1.36.5 // indirect
141-
k8s.io/apiserver v0.34.0 // indirect
142-
k8s.io/component-helpers v0.34.0 // indirect
143-
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
144-
k8s.io/kms v0.34.0 // indirect
145-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
138+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
139+
google.golang.org/grpc v1.72.2 // indirect
140+
google.golang.org/protobuf v1.36.8 // indirect
141+
k8s.io/apiserver v0.35.0 // indirect
142+
k8s.io/component-helpers v0.35.0 // indirect
143+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
144+
k8s.io/kms v0.35.0 // indirect
145+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
146146
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
147-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
147+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
148148
sigs.k8s.io/yaml v1.6.0 // indirect
149149
)

0 commit comments

Comments
 (0)