Skip to content

Commit 38740ea

Browse files
authored
Merge pull request #2275 from mythi/PR-2026-005
k8s 1.36.0
2 parents a6275bd + eb04ea5 commit 38740ea

17 files changed

Lines changed: 197 additions & 200 deletions

.github/workflows/lib-validate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ jobs:
7777
strategy:
7878
matrix:
7979
version:
80-
- 1.33.x
8180
- 1.34.x
8281
- 1.35.x
82+
- 1.36.x
8383
steps:
8484
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
8585
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v5
@@ -88,7 +88,7 @@ jobs:
8888
check-latest: true
8989
- name: Install envtest and k8s control plane
9090
run: |
91-
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.23
91+
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.24
9292
setup-envtest use ${{ matrix.version }}
9393
- name: Run envtest
9494
run: |

cmd/gpu_plugin/gpu_plugin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"path"
2121
"path/filepath"
2222
"reflect"
23+
"slices"
2324
"strings"
2425
"testing"
2526

2627
"github.com/pkg/errors"
2728
"k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
28-
"k8s.io/utils/strings/slices"
2929

3030
"github.com/intel/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/levelzeroservice"
3131
dpapi "github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin"

go.mod

Lines changed: 65 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ require (
1616
golang.org/x/sys v0.43.0
1717
golang.org/x/text v0.36.0
1818
google.golang.org/grpc v1.80.0
19-
google.golang.org/protobuf v1.36.11
19+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
2020
gopkg.in/yaml.v2 v2.4.0
21-
k8s.io/api v0.35.1
22-
k8s.io/apimachinery v0.35.1
23-
k8s.io/client-go v0.35.1
24-
k8s.io/component-base v0.35.1
25-
k8s.io/klog/v2 v2.130.1
21+
k8s.io/api v0.36.0
22+
k8s.io/apimachinery v0.36.0
23+
k8s.io/client-go v0.36.0
24+
k8s.io/component-base v0.36.0
25+
k8s.io/klog/v2 v2.140.0
2626
k8s.io/kubelet v0.34.0
27-
k8s.io/kubernetes v1.35.0
27+
k8s.io/kubernetes v1.36.0
2828
k8s.io/pod-security-admission v0.0.0
29-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
30-
sigs.k8s.io/controller-runtime v0.23.3
29+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
30+
sigs.k8s.io/controller-runtime v0.24.0
3131
sigs.k8s.io/yaml v1.6.0
3232
tags.cncf.io/container-device-interface v1.1.0
3333
tags.cncf.io/container-device-interface/specs-go v1.1.0
@@ -39,11 +39,11 @@ require (
3939
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4040
github.com/beorn7/perks v1.0.1 // indirect
4141
github.com/blang/semver/v4 v4.0.0 // indirect
42-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
42+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4343
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4444
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4545
github.com/distribution/reference v0.6.0 // indirect
46-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
46+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4747
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4848
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4949
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -53,13 +53,12 @@ require (
5353
github.com/go-openapi/jsonreference v0.20.2 // indirect
5454
github.com/go-openapi/swag v0.23.0 // indirect
5555
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
56-
github.com/google/btree v1.1.3 // indirect
5756
github.com/google/cel-go v0.26.0 // indirect
5857
github.com/google/gnostic-models v0.7.0 // indirect
5958
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
6059
github.com/google/uuid v1.6.0 // indirect
6160
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
62-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
6362
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6463
github.com/josharian/intern v1.0.0 // indirect
6564
github.com/json-iterator/go v1.1.12 // indirect
@@ -70,87 +69,91 @@ require (
7069
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7170
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7271
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
73-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7472
github.com/opencontainers/go-digest v1.0.0 // indirect
7573
github.com/opencontainers/runtime-spec v1.3.0 // indirect
7674
github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 // indirect
77-
github.com/pmezard/go-difflib v1.0.0 // indirect
75+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7876
github.com/prometheus/client_golang v1.23.2 // indirect
79-
github.com/prometheus/procfs v0.16.1 // indirect
77+
github.com/prometheus/procfs v0.19.2 // indirect
8078
github.com/robfig/cron/v3 v3.0.1 // indirect
81-
github.com/spf13/cobra v1.10.0 // indirect
79+
github.com/spf13/cobra v1.10.2 // indirect
8280
github.com/spf13/pflag v1.0.9 // indirect
8381
github.com/stoewer/go-strcase v1.3.0 // indirect
8482
github.com/x448/float16 v0.8.4 // indirect
8583
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
86-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
8785
go.opentelemetry.io/otel v1.43.0 // indirect
88-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
89-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
86+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
9088
go.opentelemetry.io/otel/metric v1.43.0 // indirect
9189
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
9290
go.opentelemetry.io/otel/trace v1.43.0 // indirect
93-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
91+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
9492
go.yaml.in/yaml/v2 v2.4.3 // indirect
9593
go.yaml.in/yaml/v3 v3.0.4 // indirect
9694
golang.org/x/crypto v0.49.0 // indirect
97-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
95+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
9896
golang.org/x/mod v0.34.0 // indirect
9997
golang.org/x/net v0.52.0 // indirect
10098
golang.org/x/oauth2 v0.34.0 // indirect
10199
golang.org/x/sync v0.20.0 // indirect
102100
golang.org/x/term v0.41.0 // indirect
103-
golang.org/x/time v0.9.0 // indirect
101+
golang.org/x/time v0.14.0 // indirect
104102
golang.org/x/tools v0.43.0 // indirect
105103
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
106-
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
107-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
104+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
108106
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
109107
gopkg.in/inf.v0 v0.9.1 // indirect
110108
gopkg.in/yaml.v3 v3.0.1 // indirect
111-
k8s.io/apiextensions-apiserver v0.35.0 // indirect
112-
k8s.io/apiserver v0.35.1 // indirect
113-
k8s.io/component-helpers v0.35.1 // indirect
109+
k8s.io/apiextensions-apiserver v0.36.0 // indirect
110+
k8s.io/apiserver v0.36.0 // indirect
111+
k8s.io/component-helpers v0.36.0 // indirect
114112
k8s.io/controller-manager v0.34.0-rc.2 // indirect
115-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
113+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
116114
k8s.io/kubectl v0.0.0 // indirect
117-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
115+
k8s.io/streaming v0.36.0 // indirect
116+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
118117
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
119118
sigs.k8s.io/randfill v1.0.0 // indirect
120-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
119+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
121120
)
122121

123122
replace (
124-
k8s.io/api => k8s.io/api v0.35.1
125-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.1
126-
k8s.io/apimachinery => k8s.io/apimachinery v0.35.1
127-
k8s.io/apiserver => k8s.io/apiserver v0.35.1
128-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.35.1
129-
k8s.io/client-go => k8s.io/client-go v0.35.1
130-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.35.1
131-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.1
132-
k8s.io/code-generator => k8s.io/code-generator v0.35.1
133-
k8s.io/component-base => k8s.io/component-base v0.35.1
134-
k8s.io/component-helpers => k8s.io/component-helpers v0.35.1
135-
k8s.io/controller-manager => k8s.io/controller-manager v0.35.1
136-
k8s.io/cri-api => k8s.io/cri-api v0.35.1
137-
k8s.io/cri-client => k8s.io/cri-client v0.35.1
138-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.35.1
139-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.35.1
140-
k8s.io/endpointslice => k8s.io/endpointslice v0.35.1
141-
k8s.io/kms => k8s.io/kms v0.35.1
142-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.1
143-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.1
144-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.1
145-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.1
146-
k8s.io/kubectl => k8s.io/kubectl v0.35.1
147-
k8s.io/kubelet => k8s.io/kubelet v0.35.1
148-
k8s.io/metrics => k8s.io/metrics v0.35.1
149-
k8s.io/mount-utils => k8s.io/mount-utils v0.35.1
150-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.35.1
151-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.1
152-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.35.1
153-
k8s.io/sample-controller => k8s.io/sample-controller v0.35.1
123+
k8s.io/api => k8s.io/api v0.36.0
124+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.0
125+
k8s.io/apimachinery => k8s.io/apimachinery v0.36.0
126+
k8s.io/apiserver => k8s.io/apiserver v0.36.0
127+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.0
128+
k8s.io/client-go => k8s.io/client-go v0.36.0
129+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.0
130+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.0
131+
k8s.io/code-generator => k8s.io/code-generator v0.36.0
132+
k8s.io/component-base => k8s.io/component-base v0.36.0
133+
k8s.io/component-helpers => k8s.io/component-helpers v0.36.0
134+
k8s.io/controller-manager => k8s.io/controller-manager v0.36.0
135+
k8s.io/cri-api => k8s.io/cri-api v0.36.0
136+
k8s.io/cri-client => k8s.io/cri-client v0.36.0
137+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.0
138+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.0
139+
k8s.io/endpointslice => k8s.io/endpointslice v0.36.0
140+
k8s.io/kms => k8s.io/kms v0.36.0
141+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.0
142+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.0
143+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.0
144+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.0
145+
k8s.io/kubectl => k8s.io/kubectl v0.36.0
146+
k8s.io/kubelet => k8s.io/kubelet v0.36.0
147+
k8s.io/metrics => k8s.io/metrics v0.36.0
148+
k8s.io/mount-utils => k8s.io/mount-utils v0.36.0
149+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.0
150+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.0
151+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.36.0
152+
k8s.io/sample-controller => k8s.io/sample-controller v0.36.0
154153
)
155154

156-
replace k8s.io/externaljwt => k8s.io/externaljwt v0.35.1
155+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.36.0
156+
157+
replace k8s.io/cri-streaming => k8s.io/cri-streaming v0.36.0
158+
159+
replace k8s.io/streaming => k8s.io/streaming v0.36.0

0 commit comments

Comments
 (0)