Skip to content

Commit 3b7a391

Browse files
authored
Merge pull request #1382 from Ganiredi/1.36-k8s-deps
1.36.0 rc release
2 parents baa607a + 30c3f1f commit 3b7a391

8 files changed

Lines changed: 366 additions & 359 deletions

File tree

.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.25.5-bookworm.0
1+
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.26.2-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.25.5
17+
ARG GOLANG_IMAGE=golang:1.26.2
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.25.5-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.26.2-bookworm.0
2626

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

Makefile

Lines changed: 1 addition & 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.25.0
29+
GOLANG_DIRECTIVE_VERSION ?= 1.26.0
3030
CURL_RETRIES ?= 3
3131

3232
# flags for ecr-credential-provider artifact promotion

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.25.5-bookworm'
20+
- name: 'docker.io/library/golang:1.26.2-bookworm'
2121
id: cloudbuild-artifacts
2222
entrypoint: make
2323
env:

go.mod

Lines changed: 51 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.25.0
3+
go 1.26.0
44

55
require (
66
github.com/Pallinder/go-randomdata v1.2.0
@@ -16,30 +16,32 @@ require (
1616
github.com/onsi/ginkgo/v2 v2.27.2
1717
github.com/onsi/gomega v1.38.2
1818
github.com/samber/lo v1.49.1
19-
github.com/spf13/cobra v1.10.0
19+
github.com/spf13/cobra v1.10.2
2020
github.com/spf13/pflag v1.0.9
2121
github.com/stretchr/testify v1.11.1
22-
golang.org/x/time v0.11.0
22+
golang.org/x/time v0.14.0
2323
gopkg.in/gcfg.v1 v1.2.3
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
31-
k8s.io/klog/v2 v2.130.1
32-
k8s.io/kubelet v0.35.0
33-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
24+
k8s.io/api v0.36.0-rc.0
25+
k8s.io/apimachinery v0.36.0-rc.0
26+
k8s.io/client-go v0.36.0-rc.0
27+
k8s.io/cloud-provider v0.36.0-rc.0
28+
k8s.io/code-generator v0.36.0-rc.0
29+
k8s.io/component-base v0.36.0-rc.0
30+
k8s.io/controller-manager v0.36.0-rc.0
31+
k8s.io/klog/v2 v2.140.0
32+
k8s.io/kubelet v0.36.0-rc.0
33+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
3434
sigs.k8s.io/controller-runtime v0.20.3
3535
)
3636

3737
require (
38-
cel.dev/expr v0.24.0 // indirect
38+
cel.dev/expr v0.25.1 // indirect
3939
github.com/Masterminds/semver/v3 v3.4.0 // indirect
40+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4041
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
41-
github.com/google/btree v1.1.3 // indirect
4242
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
43+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
44+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
4345
github.com/kylelemons/godebug v1.1.0 // indirect
4446
github.com/prometheus/client_golang v1.23.2 // indirect
4547
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
@@ -50,8 +52,9 @@ require (
5052
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5153
gopkg.in/warnings.v0 v0.1.2 // indirect
5254
gopkg.in/yaml.v3 v3.0.1 // indirect
55+
k8s.io/streaming v0.36.0-rc.0 // indirect
5356
sigs.k8s.io/randfill v1.0.0 // indirect
54-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
57+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
5558
)
5659

5760
require (
@@ -72,12 +75,11 @@ require (
7275
github.com/aws/smithy-go v1.24.0
7376
github.com/beorn7/perks v1.0.1 // indirect
7477
github.com/blang/semver/v4 v4.0.0 // indirect
75-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7678
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7779
github.com/coreos/go-semver v0.3.1 // indirect
78-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
80+
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
7981
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
80-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
82+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
8183
github.com/felixge/httpsnoop v1.0.4 // indirect
8284
github.com/fsnotify/fsnotify v1.9.0 // indirect
8385
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -92,8 +94,7 @@ require (
9294
github.com/google/gnostic-models v0.7.0 // indirect
9395
github.com/google/go-cmp v0.7.0 // indirect
9496
github.com/google/uuid v1.6.0 // indirect
95-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
96-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
97+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
9798
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9899
github.com/josharian/intern v1.0.0 // indirect
99100
github.com/json-iterator/go v1.1.12 // indirect
@@ -104,45 +105,45 @@ require (
104105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105106
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
106107
github.com/prometheus/client_model v0.6.2 // indirect
107-
github.com/prometheus/common v0.66.1 // indirect
108-
github.com/prometheus/procfs v0.16.1 // indirect
108+
github.com/prometheus/common v0.67.5 // indirect
109+
github.com/prometheus/procfs v0.19.2 // indirect
109110
github.com/stoewer/go-strcase v1.3.0 // indirect
110111
github.com/stretchr/objx v0.5.2 // indirect
111112
github.com/x448/float16 v0.8.4 // indirect
112-
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
113-
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
114-
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
116-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
113+
go.etcd.io/etcd/api/v3 v3.6.8 // indirect
114+
go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
115+
go.etcd.io/etcd/client/v3 v3.6.8 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
117118
go.opentelemetry.io/otel v1.40.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
120121
go.opentelemetry.io/otel/metric v1.40.0 // indirect
121122
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
122123
go.opentelemetry.io/otel/trace v1.40.0 // indirect
123-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
124+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
124125
go.uber.org/multierr v1.11.0 // indirect
125-
go.uber.org/zap v1.27.0 // indirect
126-
golang.org/x/crypto v0.45.0 // indirect
127-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
128-
golang.org/x/mod v0.29.0 // indirect
129-
golang.org/x/net v0.47.0 // indirect
130-
golang.org/x/oauth2 v0.30.0 // indirect
131-
golang.org/x/sync v0.18.0
126+
go.uber.org/zap v1.27.1 // indirect
127+
golang.org/x/crypto v0.47.0 // indirect
128+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
129+
golang.org/x/mod v0.32.0 // indirect
130+
golang.org/x/net v0.49.0 // indirect
131+
golang.org/x/oauth2 v0.34.0 // indirect
132+
golang.org/x/sync v0.19.0
132133
golang.org/x/sys v0.40.0 // indirect
133-
golang.org/x/term v0.37.0 // indirect
134-
golang.org/x/text v0.31.0 // indirect
135-
golang.org/x/tools v0.38.0 // indirect
136-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
138-
google.golang.org/grpc v1.72.2 // indirect
139-
google.golang.org/protobuf v1.36.8 // indirect
140-
k8s.io/apiserver v0.35.0 // indirect
141-
k8s.io/component-helpers v0.35.0 // indirect
134+
golang.org/x/term v0.39.0 // indirect
135+
golang.org/x/text v0.33.0 // indirect
136+
golang.org/x/tools v0.41.0 // indirect
137+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
138+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
139+
google.golang.org/grpc v1.79.3 // indirect
140+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
141+
k8s.io/apiserver v0.36.0-rc.0 // indirect
142+
k8s.io/component-helpers v0.36.0-rc.0 // indirect
142143
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
143-
k8s.io/kms v0.35.0 // indirect
144-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
145-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
144+
k8s.io/kms v0.36.0-rc.0 // indirect
145+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
146+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
146147
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
147148
sigs.k8s.io/yaml v1.6.0 // indirect
148149
)

0 commit comments

Comments
 (0)