Skip to content

Commit 98e7a58

Browse files
paulyufan2paulyufan2
committed
Chore: update k8s.io dependencies
1 parent bd7e2ae commit 98e7a58

File tree

6 files changed

+72
-297
lines changed

6 files changed

+72
-297
lines changed

‎cns/middlewares/k8sSwiftV2.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ import (
1212
"github.com/pkg/errors"
1313
v1 "k8s.io/api/core/v1"
1414
k8stypes "k8s.io/apimachinery/pkg/types"
15-
"k8s.io/kubernetes/pkg/kubelet"
1615
"sigs.k8s.io/controller-runtime/pkg/client"
1716
)
1817

18+
const (
19+
prefixLength = 32
20+
overlayGatewayv4 = "169.254.1.1"
21+
virtualGW = "169.254.2.1"
22+
overlayGatewayV6 = "fe80::1234:5678:9abc"
23+
NetworkNotReadyErrorMsg = "network is not ready"
24+
)
25+
1926
var (
2027
errMTPNCNotReady = errors.New(kubelet.NetworkNotReadyErrorMsg + " - mtpnc is not ready")
2128
errGetMTPNC = errors.New(kubelet.NetworkNotReadyErrorMsg + " - failed to get MTPNC")
2229
errInvalidSWIFTv2NICType = errors.New("invalid NIC type for SWIFT v2 scenario")
2330
errInvalidMTPNCPrefixLength = errors.New("invalid prefix length for MTPNC primaryIP, must be 32")
2431
)
2532

26-
const (
27-
prefixLength = 32
28-
overlayGatewayv4 = "169.254.1.1"
29-
virtualGW = "169.254.2.1"
30-
overlayGatewayV6 = "fe80::1234:5678:9abc"
31-
)
32-
3333
type K8sSWIFTv2Middleware struct {
3434
Cli client.Client
3535
}

‎cns/middlewares/k8sSwiftV2_linux_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
1616
"github.com/google/go-cmp/cmp"
1717
"gotest.tools/v3/assert"
18-
"k8s.io/kubernetes/pkg/kubelet"
1918
)
2019

2120
var (
@@ -210,14 +209,14 @@ func TestValidateMultitenantIPConfigsRequestFailure(t *testing.T) {
210209
failReq.OrchestratorContext = b
211210
_, respCode, msg := middleware.GetPodInfoForIPConfigsRequest(context.TODO(), failReq)
212211
assert.Equal(t, respCode, types.UnexpectedError)
213-
assert.Assert(t, strings.Contains(msg, kubelet.NetworkNotReadyErrorMsg), "expected error message to contain '%s', got '%s'", kubelet.NetworkNotReadyErrorMsg, msg)
212+
assert.Assert(t, strings.Contains(msg, NetworkNotReadyErrorMsg), "expected error message to contain '%s', got '%s'", NetworkNotReadyErrorMsg, msg)
214213

215214
// MTPNC not ready
216215
b, _ = testPod4Info.OrchestratorContext()
217216
failReq.OrchestratorContext = b
218217
_, respCode, msg = middleware.GetPodInfoForIPConfigsRequest(context.TODO(), failReq)
219218
assert.Equal(t, respCode, types.UnexpectedError)
220-
assert.Assert(t, strings.Contains(msg, kubelet.NetworkNotReadyErrorMsg), "expected error message to contain '%s', got '%s'", kubelet.NetworkNotReadyErrorMsg, msg)
219+
assert.Assert(t, strings.Contains(msg, NetworkNotReadyErrorMsg), "expected error message to contain '%s', got '%s'", NetworkNotReadyErrorMsg, msg)
221220
}
222221

223222
func TestGetSWIFTv2IPConfigSuccess(t *testing.T) {
@@ -242,12 +241,12 @@ func TestGetSWIFTv2IPConfigFailure(t *testing.T) {
242241
// Pod's MTPNC doesn't exist in cache test
243242
_, err := middleware.getIPConfig(context.TODO(), testPod3Info)
244243
assert.Assert(t, strings.Contains(err.Error(), errGetMTPNC.Error()), "expected error to wrap errMTPNCNotFound, got: %v", err)
245-
assert.ErrorContains(t, err, kubelet.NetworkNotReadyErrorMsg)
244+
assert.ErrorContains(t, err, NetworkNotReadyErrorMsg)
246245

247246
// Pod's MTPNC is not ready test
248247
_, err = middleware.getIPConfig(context.TODO(), testPod4Info)
249248
assert.Assert(t, errors.Is(err, errMTPNCNotReady), "expected error to wrap errMTPNCNotReady, got: %v", err)
250-
assert.ErrorContains(t, err, kubelet.NetworkNotReadyErrorMsg)
249+
assert.ErrorContains(t, err, NetworkNotReadyErrorMsg)
251250
}
252251

253252
func TestSetRoutesSuccess(t *testing.T) {

‎go.mod‎

Lines changed: 18 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/go-logr/zapr v1.3.0
1818
github.com/golang/mock v1.6.0
1919
github.com/golang/protobuf v1.5.4
20-
github.com/google/gnostic-models v0.6.8 // indirect
20+
github.com/google/gnostic-models v0.7.0 // indirect
2121
github.com/google/go-cmp v0.7.0
2222
github.com/google/uuid v1.6.0
2323
github.com/gorilla/mux v1.8.1
@@ -41,13 +41,13 @@ require (
4141
google.golang.org/grpc v1.75.0
4242
google.golang.org/protobuf v1.36.8
4343
gopkg.in/natefinch/lumberjack.v2 v2.2.1
44-
k8s.io/api v0.30.14
44+
k8s.io/api v0.34.1
4545
k8s.io/apiextensions-apiserver v0.30.1
46-
k8s.io/apimachinery v0.30.14
47-
k8s.io/client-go v0.30.14
46+
k8s.io/apimachinery v0.34.1
47+
k8s.io/client-go v0.34.1
4848
k8s.io/klog v1.0.0
4949
k8s.io/klog/v2 v2.130.1
50-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
50+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
5151
sigs.k8s.io/controller-runtime v0.18.4
5252
)
5353

@@ -60,18 +60,15 @@ require (
6060
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6161
github.com/coreos/go-iptables v0.8.0
6262
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
63-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6463
github.com/fsnotify/fsnotify v1.9.0
6564
github.com/go-logr/logr v1.4.3 // indirect
66-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
65+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6766
github.com/go-openapi/jsonreference v0.20.4 // indirect
68-
github.com/go-openapi/swag v0.22.7 // indirect
67+
github.com/go-openapi/swag v0.23.0 // indirect
6968
github.com/gofrs/uuid v4.4.0+incompatible // indirect
7069
github.com/gogo/protobuf v1.3.2 // indirect
7170
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
72-
github.com/google/gofuzz v1.2.0 // indirect
7371
github.com/hpcloud/tail v1.0.0 // indirect
74-
github.com/imdario/mergo v0.3.16 // indirect
7572
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7673
github.com/josharian/intern v1.0.0 // indirect
7774
github.com/json-iterator/go v1.1.12 // indirect
@@ -82,9 +79,9 @@ require (
8279
github.com/mattn/go-colorable v0.1.14 // indirect
8380
github.com/mattn/go-isatty v0.0.20 // indirect
8481
github.com/mitchellh/mapstructure v1.5.0 // indirect
85-
github.com/moby/spdystream v0.4.0 // indirect
82+
github.com/moby/spdystream v0.5.0 // indirect
8683
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
87-
github.com/modern-go/reflect2 v1.0.2 // indirect
84+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8885
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8986
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
9087
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -114,9 +111,8 @@ require (
114111
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
115112
gopkg.in/yaml.v2 v2.4.0 // indirect
116113
gopkg.in/yaml.v3 v3.0.1 // indirect
117-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
118-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
119-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
114+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
115+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
120116
)
121117

122118
require (
@@ -132,35 +128,16 @@ require (
132128
golang.org/x/sync v0.16.0
133129
gotest.tools/v3 v3.5.2
134130
k8s.io/kubectl v0.28.5
135-
k8s.io/kubernetes v1.30.14
136131
sigs.k8s.io/yaml v1.6.0
137132
)
138133

139134
require (
140-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
141-
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
142-
github.com/NYTimes/gziphandler v1.1.1 // indirect
143-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
144-
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
145135
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
146136
github.com/blang/semver/v4 v4.0.0 // indirect
147-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
148-
github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect
149137
github.com/cilium/proxy v0.0.0-20231202123106-38b645b854f3 // indirect
150-
github.com/container-storage-interface/spec v1.8.0 // indirect
151-
github.com/containerd/cgroups v1.1.0 // indirect
152-
github.com/containerd/console v1.0.4 // indirect
153138
github.com/containerd/errdefs/pkg v0.3.0 // indirect
154-
github.com/containerd/log v0.1.0 // indirect
155-
github.com/containerd/ttrpc v1.2.5 // indirect
156139
github.com/containerd/typeurl/v2 v2.2.0 // indirect
157-
github.com/coreos/go-semver v0.3.1 // indirect
158-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
159-
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
160-
github.com/distribution/reference v0.6.0 // indirect
161-
github.com/docker/go-units v0.5.0 // indirect
162-
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
163-
github.com/felixge/httpsnoop v1.0.4 // indirect
140+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
164141
github.com/go-logr/stdr v1.2.2 // indirect
165142
github.com/go-ole/go-ole v1.2.6 // indirect
166143
github.com/go-openapi/analysis v0.21.4 // indirect
@@ -171,79 +148,42 @@ require (
171148
github.com/go-openapi/strfmt v0.21.9 // indirect
172149
github.com/go-openapi/validate v0.22.3 // indirect
173150
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
174-
github.com/godbus/dbus/v5 v5.1.0 // indirect
175-
github.com/google/cadvisor v0.49.2 // indirect
176-
github.com/google/cel-go v0.17.8 // indirect
177151
github.com/google/gopacket v1.1.19 // indirect
178-
github.com/gorilla/websocket v1.5.1 // indirect
179-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
180-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
152+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
181153
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
182-
github.com/karrick/godirwalk v1.17.0 // indirect
183154
github.com/kr/pretty v0.3.1 // indirect
184155
github.com/kr/text v0.2.0 // indirect
185156
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
186-
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
187-
github.com/moby/sys/mountinfo v0.7.1 // indirect
188-
github.com/moby/sys/user v0.3.0 // indirect
189-
github.com/moby/sys/userns v0.1.0 // indirect
190-
github.com/mrunalp/fileutils v0.5.1 // indirect
191157
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
192158
github.com/oklog/ulid v1.3.1 // indirect
193-
github.com/opencontainers/go-digest v1.0.0 // indirect
194-
github.com/opencontainers/runc v1.2.3 // indirect
195-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
196-
github.com/opencontainers/selinux v1.11.0 // indirect
197159
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
198160
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
199161
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
200162
github.com/rogpeppe/go-internal v1.13.1 // indirect
201163
github.com/sasha-s/go-deadlock v0.3.1 // indirect
202-
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
203164
github.com/shirou/gopsutil/v3 v3.23.5 // indirect
204-
github.com/stoewer/go-strcase v1.2.0 // indirect
205-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
206165
github.com/tklauser/go-sysconf v0.3.11 // indirect
207166
github.com/tklauser/numcpus v0.6.0 // indirect
167+
github.com/x448/float16 v0.8.4 // indirect
208168
github.com/yusufpapurcu/wmi v1.2.3 // indirect
209-
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
210-
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
211-
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
212169
go.mongodb.org/mongo-driver v1.13.1 // indirect
213170
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
214-
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
215-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
216-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
217171
go.opentelemetry.io/otel v1.37.0 // indirect
218-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
219-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
220172
go.opentelemetry.io/otel/metric v1.37.0 // indirect
221-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
222173
go.opentelemetry.io/otel/trace v1.37.0 // indirect
223-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
224174
go.uber.org/dig v1.17.1 // indirect
225175
go.yaml.in/yaml/v2 v2.4.2 // indirect
226176
go.yaml.in/yaml/v3 v3.0.4 // indirect
227177
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
228-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
229-
k8s.io/apiserver v0.30.14 // indirect
230-
k8s.io/cloud-provider v0.30.7 // indirect
231-
k8s.io/component-base v0.30.14 // indirect
232-
k8s.io/component-helpers v0.30.7 // indirect
233-
k8s.io/controller-manager v0.30.7 // indirect
234-
k8s.io/cri-api v0.30.14 // indirect
235-
k8s.io/csi-translation-lib v0.30.14 // indirect
236-
k8s.io/dynamic-resource-allocation v0.30.14 // indirect
237-
k8s.io/kms v0.30.14 // indirect
238-
k8s.io/kube-scheduler v0.30.14 // indirect
239-
k8s.io/mount-utils v0.30.14 // indirect
240-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
178+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
179+
sigs.k8s.io/randfill v1.0.0 // indirect
180+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
241181
)
242182

243183
require (
244184
github.com/containerd/cgroups/v3 v3.0.3 // indirect
245185
github.com/containerd/errdefs v0.3.0 // indirect
246-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
186+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
247187
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
248188
github.com/sagikazarmark/locafero v0.7.0 // indirect
249189
github.com/sourcegraph/conc v0.3.0 // indirect

0 commit comments

Comments
 (0)