Skip to content

Commit 467b523

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #933 from astefanutti/pr-k8s-1.34
Upgrade k8s to v1.34
2 parents 248fdf4 + d62d904 commit 467b523

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+968
-782
lines changed

‎apis/config/scheme/scheme_test.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ package scheme
1919
import (
2020
"bytes"
2121
"testing"
22+
"time"
2223

2324
"github.com/google/go-cmp/cmp"
2425
corev1 "k8s.io/api/core/v1"
2526
"k8s.io/apimachinery/pkg/api/resource"
27+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2628
"k8s.io/apimachinery/pkg/runtime"
2729
"k8s.io/apimachinery/pkg/runtime/schema"
2830
schedconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
2931
"k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults"
32+
"k8s.io/utils/ptr"
3033

3134
"sigs.k8s.io/scheduler-plugins/apis/config"
3235
v1 "sigs.k8s.io/scheduler-plugins/apis/config/v1"
@@ -114,6 +117,12 @@ profiles:
114117
Name: "DefaultPreemption",
115118
Args: &schedconfig.DefaultPreemptionArgs{MinCandidateNodesPercentage: 10, MinCandidateNodesAbsolute: 100},
116119
},
120+
{
121+
Name: "DynamicResources",
122+
Args: &schedconfig.DynamicResourcesArgs{
123+
FilterTimeout: ptr.To(metav1.Duration{Duration: 10 * time.Second}),
124+
},
125+
},
117126
{
118127
Name: "InterPodAffinity",
119128
Args: &schedconfig.InterPodAffinityArgs{HardPodAffinityWeight: 1},
@@ -183,6 +192,12 @@ profiles:
183192
Name: "DefaultPreemption",
184193
Args: &schedconfig.DefaultPreemptionArgs{MinCandidateNodesPercentage: 10, MinCandidateNodesAbsolute: 100},
185194
},
195+
{
196+
Name: "DynamicResources",
197+
Args: &schedconfig.DynamicResourcesArgs{
198+
FilterTimeout: ptr.To(metav1.Duration{Duration: 10 * time.Second}),
199+
},
200+
},
186201
{
187202
Name: "InterPodAffinity",
188203
Args: &schedconfig.InterPodAffinityArgs{HardPodAffinityWeight: 1},

‎config/crd/bases/scheduling.x-k8s.io_elasticquotas.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/52
7-
controller-gen.kubebuilder.io/version: v0.17.3
7+
controller-gen.kubebuilder.io/version: v0.19.0
88
name: elasticquotas.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

‎config/crd/bases/scheduling.x-k8s.io_podgroups.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/scheduler-plugins/pull/50
7-
controller-gen.kubebuilder.io/version: v0.17.3
7+
controller-gen.kubebuilder.io/version: v0.19.0
88
name: podgroups.scheduling.x-k8s.io
99
spec:
1010
group: scheduling.x-k8s.io

‎go.mod‎

Lines changed: 79 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ require (
1818
github.com/spf13/pflag v1.0.6
1919
github.com/stretchr/testify v1.10.0
2020
gonum.org/v1/gonum v0.12.0
21-
k8s.io/api v0.33.5
22-
k8s.io/apimachinery v0.33.5
23-
k8s.io/apiserver v0.33.5
24-
k8s.io/client-go v0.33.5
25-
k8s.io/code-generator v0.33.5
26-
k8s.io/component-base v0.33.5
27-
k8s.io/component-helpers v0.33.5
21+
k8s.io/api v0.34.1
22+
k8s.io/apimachinery v0.34.1
23+
k8s.io/apiserver v0.34.1
24+
k8s.io/client-go v0.34.1
25+
k8s.io/code-generator v0.34.1
26+
k8s.io/component-base v0.34.1
27+
k8s.io/component-helpers v0.34.1
2828
k8s.io/klog/v2 v2.130.1
29-
k8s.io/kube-scheduler v0.33.5
30-
k8s.io/kubernetes v1.33.5
31-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
32-
sigs.k8s.io/controller-runtime v0.20.4
29+
k8s.io/kube-scheduler v0.34.1
30+
k8s.io/kubernetes v1.34.1
31+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
32+
sigs.k8s.io/controller-runtime v0.22.1
3333
sigs.k8s.io/logtools v0.9.0
3434
sigs.k8s.io/security-profiles-operator v0.4.0
35-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
36-
sigs.k8s.io/yaml v1.4.0
35+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
36+
sigs.k8s.io/yaml v1.6.0
3737
)
3838

3939
require (
40-
cel.dev/expr v0.19.1 // indirect
40+
cel.dev/expr v0.24.0 // indirect
4141
dario.cat/mergo v1.0.1 // indirect
4242
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4343
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -52,24 +52,24 @@ require (
5252
github.com/crossplane/crossplane-runtime v1.20.0 // indirect
5353
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5454
github.com/distribution/reference v0.6.0 // indirect
55-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
55+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5656
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5757
github.com/felixge/httpsnoop v1.0.4 // indirect
5858
github.com/francoispqt/gojay v1.2.13 // indirect
59-
github.com/fsnotify/fsnotify v1.8.0 // indirect
60-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
59+
github.com/fsnotify/fsnotify v1.9.0 // indirect
60+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6161
github.com/go-logr/stdr v1.2.2 // indirect
6262
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6363
github.com/go-openapi/jsonreference v0.21.0 // indirect
6464
github.com/go-openapi/swag v0.23.0 // indirect
6565
github.com/gogo/protobuf v1.3.2 // indirect
6666
github.com/golang/protobuf v1.5.4 // indirect
6767
github.com/google/btree v1.1.3 // indirect
68-
github.com/google/cel-go v0.23.2 // indirect
69-
github.com/google/gnostic-models v0.6.9 // indirect
68+
github.com/google/cel-go v0.26.0 // indirect
69+
github.com/google/gnostic-models v0.7.0 // indirect
7070
github.com/google/uuid v1.6.0 // indirect
7171
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
72-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
7373
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7474
github.com/josharian/intern v1.0.0 // indirect
7575
github.com/jpillora/backoff v1.0.0 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/mailru/easyjson v0.7.7 // indirect
7979
github.com/moby/term v0.5.0 // indirect
8080
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
81-
github.com/modern-go/reflect2 v1.0.2 // indirect
81+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8282
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8383
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
8484
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -91,24 +91,26 @@ require (
9191
github.com/prometheus/procfs v0.15.1 // indirect
9292
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
9393
github.com/sirupsen/logrus v1.9.3 // indirect
94-
github.com/spf13/cobra v1.8.1 // indirect
94+
github.com/spf13/cobra v1.9.1 // indirect
9595
github.com/stoewer/go-strcase v1.3.0 // indirect
9696
github.com/x448/float16 v0.8.4 // indirect
97-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
98-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
99-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
97+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
98+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
99+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
100100
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
101-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
102102
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
103-
go.opentelemetry.io/otel v1.33.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
105-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
106-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
107-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
108-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
109-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
103+
go.opentelemetry.io/otel v1.35.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
109+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
110110
go.uber.org/multierr v1.11.0 // indirect
111111
go.uber.org/zap v1.27.0 // indirect
112+
go.yaml.in/yaml/v2 v2.4.2 // indirect
113+
go.yaml.in/yaml/v3 v3.0.4 // indirect
112114
golang.org/x/crypto v0.36.0 // indirect
113115
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
114116
golang.org/x/mod v0.22.0 // indirect
@@ -121,66 +123,66 @@ require (
121123
golang.org/x/time v0.9.0 // indirect
122124
golang.org/x/tools v0.28.0 // indirect
123125
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
126-
google.golang.org/grpc v1.69.4 // indirect
126+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
128+
google.golang.org/grpc v1.72.1 // indirect
127129
google.golang.org/protobuf v1.36.5 // indirect
128130
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
129131
gopkg.in/inf.v0 v0.9.1 // indirect
130132
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
131133
gopkg.in/yaml.v2 v2.4.0 // indirect
132134
gopkg.in/yaml.v3 v3.0.1 // indirect
133-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
134-
k8s.io/cloud-provider v0.33.5 // indirect
135-
k8s.io/controller-manager v0.33.5 // indirect
135+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
136+
k8s.io/cloud-provider v0.34.1 // indirect
137+
k8s.io/controller-manager v0.34.1 // indirect
136138
k8s.io/csi-translation-lib v0.32.5 // indirect
137139
k8s.io/dynamic-resource-allocation v0.32.5 // indirect
138-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
139-
k8s.io/kms v0.33.5 // indirect
140-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
141-
k8s.io/kubelet v0.33.5 // indirect
142-
k8s.io/metrics v0.33.5 // indirect
140+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
141+
k8s.io/kms v0.34.1 // indirect
142+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
143+
k8s.io/kubelet v0.34.1 // indirect
144+
k8s.io/metrics v0.34.1 // indirect
143145
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
144-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
146+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
145147
sigs.k8s.io/randfill v1.0.0 // indirect
146148
sigs.k8s.io/release-utils v0.3.0 // indirect
147149
)
148150

149151
replace (
150-
k8s.io/api => k8s.io/api v0.33.5
151-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.5
152-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.5
153-
k8s.io/apiserver => k8s.io/apiserver v0.33.5
154-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.5
155-
k8s.io/client-go => k8s.io/client-go v0.33.5
156-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.5
157-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.5
158-
k8s.io/code-generator => k8s.io/code-generator v0.33.5
159-
k8s.io/component-base => k8s.io/component-base v0.33.5
160-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.5
161-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.5
162-
k8s.io/cri-api => k8s.io/cri-api v0.33.5
163-
k8s.io/cri-client => k8s.io/cri-client v0.33.5
164-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.5
165-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.5
166-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.5
167-
k8s.io/kms => k8s.io/kms v0.33.5
168-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.5
169-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.5
170-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.5
171-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.5
172-
k8s.io/kubectl => k8s.io/kubectl v0.33.5
173-
k8s.io/kubelet => k8s.io/kubelet v0.33.5
174-
k8s.io/kubernetes => k8s.io/kubernetes v1.33.5
152+
k8s.io/api => k8s.io/api v0.34.1
153+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.1
154+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
155+
k8s.io/apiserver => k8s.io/apiserver v0.34.1
156+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.1
157+
k8s.io/client-go => k8s.io/client-go v0.34.1
158+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.1
159+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.1
160+
k8s.io/code-generator => k8s.io/code-generator v0.34.1
161+
k8s.io/component-base => k8s.io/component-base v0.34.1
162+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.1
163+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.1
164+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
165+
k8s.io/cri-client => k8s.io/cri-client v0.34.1
166+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.1
167+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.1
168+
k8s.io/endpointslice => k8s.io/endpointslice v0.34.1
169+
k8s.io/kms => k8s.io/kms v0.34.1
170+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.1
171+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.1
172+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.1
173+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.1
174+
k8s.io/kubectl => k8s.io/kubectl v0.34.1
175+
k8s.io/kubelet => k8s.io/kubelet v0.34.1
176+
k8s.io/kubernetes => k8s.io/kubernetes v1.34.1
175177
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.8
176-
k8s.io/metrics => k8s.io/metrics v0.33.5
177-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.5
178-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.5
179-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.5
178+
k8s.io/metrics => k8s.io/metrics v0.34.1
179+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
180+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.1
181+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.1
180182
)
181183

182-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.5
184+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.1
183185

184-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.5
186+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.1
185187

186-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.33.5
188+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.34.1

0 commit comments

Comments
 (0)