Skip to content

Commit f4e461d

Browse files
komer3komer3
committed
[deps] upgrade cilium to v1.18.2 and k8s deps to v0.34.1
1 parent fcd0bcc commit f4e461d

3 files changed

Lines changed: 93 additions & 91 deletions

File tree

‎cloud/linode/cilium_loadbalancers_test.go‎

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import (
66
"net"
77
"testing"
88

9-
k8sClient "github.com/cilium/cilium/pkg/k8s/client"
9+
ciliumfake "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/fake"
1010
fakev2alpha1 "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/fake"
1111
"github.com/golang/mock/gomock"
1212
"github.com/linode/linodego"
1313
v1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/client-go/kubernetes"
16+
k8sfake "k8s.io/client-go/kubernetes/fake"
1617

1718
"github.com/linode/linode-cloud-controller-manager/cloud/linode/client/mocks"
1819
"github.com/linode/linode-cloud-controller-manager/cloud/linode/options"
@@ -220,8 +221,9 @@ func testNoBGPNodeLabel(t *testing.T, mc *mocks.MockClient) {
220221
svc := createTestService()
221222
newIpHolderInstance = createNewIpHolderInstance()
222223

223-
kubeClient, _ := k8sClient.NewFakeClientset()
224-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
224+
kubeClient := k8sfake.NewClientset()
225+
ciliumClientset := ciliumfake.NewSimpleClientset()
226+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
225227
addService(t, kubeClient, svc)
226228
addNodes(t, kubeClient, nodes)
227229
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -276,8 +278,9 @@ func testUnsupportedRegion(t *testing.T, mc *mocks.MockClient) {
276278
options.Options.BGPNodeSelector = nodeSelector
277279
svc := createTestService()
278280

279-
kubeClient, _ := k8sClient.NewFakeClientset()
280-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
281+
kubeClient := k8sfake.NewClientset()
282+
ciliumClientset := ciliumfake.NewSimpleClientset()
283+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
281284
addService(t, kubeClient, svc)
282285
lb := &loadbalancers{mc, "us-foobar", kubeClient, ciliumClient, ciliumLBType}
283286

@@ -308,8 +311,9 @@ func testCreateWithExistingIPHolderWithOldIpHolderNamingConvention(t *testing.T,
308311
svc := createTestService()
309312
newIpHolderInstance = createNewIpHolderInstance()
310313

311-
kubeClient, _ := k8sClient.NewFakeClientset()
312-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
314+
kubeClient := k8sfake.NewClientset()
315+
ciliumClientset := ciliumfake.NewSimpleClientset()
316+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
313317
addService(t, kubeClient, svc)
314318
addNodes(t, kubeClient, nodes)
315319
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -353,8 +357,9 @@ func testCreateWithExistingIPHolderWithNewIpHolderNamingConvention(t *testing.T,
353357
svc := createTestService()
354358
newIpHolderInstance = createNewIpHolderInstance()
355359

356-
kubeClient, _ := k8sClient.NewFakeClientset()
357-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
360+
kubeClient := k8sfake.NewClientset()
361+
ciliumClientset := ciliumfake.NewSimpleClientset()
362+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
358363
addService(t, kubeClient, svc)
359364
addNodes(t, kubeClient, nodes)
360365
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -398,8 +403,9 @@ func testCreateWithExistingIPHolderWithNewIpHolderNamingConventionUsingLongSuffi
398403
svc := createTestService()
399404
newIpHolderInstance = createNewIpHolderInstance()
400405

401-
kubeClient, _ := k8sClient.NewFakeClientset()
402-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
406+
kubeClient := k8sfake.NewClientset()
407+
ciliumClientset := ciliumfake.NewSimpleClientset()
408+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
403409
addService(t, kubeClient, svc)
404410
addNodes(t, kubeClient, nodes)
405411
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -443,8 +449,9 @@ func testCreateWithNoExistingIPHolderUsingNoSuffix(t *testing.T, mc *mocks.MockC
443449
svc := createTestService()
444450
newIpHolderInstance = createNewIpHolderInstance()
445451

446-
kubeClient, _ := k8sClient.NewFakeClientset()
447-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
452+
kubeClient := k8sfake.NewClientset()
453+
ciliumClientset := ciliumfake.NewSimpleClientset()
454+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
448455
addService(t, kubeClient, svc)
449456
addNodes(t, kubeClient, nodes)
450457
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -495,8 +502,9 @@ func testCreateWithNoExistingIPHolderUsingShortSuffix(t *testing.T, mc *mocks.Mo
495502
svc := createTestService()
496503
newIpHolderInstance = createNewIpHolderInstance()
497504

498-
kubeClient, _ := k8sClient.NewFakeClientset()
499-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
505+
kubeClient := k8sfake.NewClientset()
506+
ciliumClientset := ciliumfake.NewSimpleClientset()
507+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
500508
addService(t, kubeClient, svc)
501509
addNodes(t, kubeClient, nodes)
502510
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -547,8 +555,9 @@ func testCreateWithNoExistingIPHolderUsingLongSuffix(t *testing.T, mc *mocks.Moc
547555
svc := createTestService()
548556
newIpHolderInstance = createNewIpHolderInstance()
549557

550-
kubeClient, _ := k8sClient.NewFakeClientset()
551-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
558+
kubeClient := k8sfake.NewClientset()
559+
ciliumClientset := ciliumfake.NewSimpleClientset()
560+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
552561
addService(t, kubeClient, svc)
553562
addNodes(t, kubeClient, nodes)
554563
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -597,8 +606,9 @@ func testEnsureCiliumLoadBalancerDeletedWithOldIpHolderNamingConvention(t *testi
597606
options.Options.BGPNodeSelector = nodeSelector
598607
svc := createTestService()
599608

600-
kubeClient, _ := k8sClient.NewFakeClientset()
601-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
609+
kubeClient := k8sfake.NewClientset()
610+
ciliumClientset := ciliumfake.NewSimpleClientset()
611+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
602612
addService(t, kubeClient, svc)
603613
addNodes(t, kubeClient, nodes)
604614
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -630,8 +640,9 @@ func testEnsureCiliumLoadBalancerDeletedWithNewIpHolderNamingConvention(t *testi
630640
svc := createTestService()
631641
newIpHolderInstance = createNewIpHolderInstance()
632642

633-
kubeClient, _ := k8sClient.NewFakeClientset()
634-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
643+
kubeClient := k8sfake.NewClientset()
644+
ciliumClientset := ciliumfake.NewSimpleClientset()
645+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
635646
addService(t, kubeClient, svc)
636647
addNodes(t, kubeClient, nodes)
637648
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -667,8 +678,9 @@ func testCiliumUpdateLoadBalancerAddNodeWithOldIpHolderNamingConvention(t *testi
667678
options.Options.BGPNodeSelector = nodeSelector
668679
svc := createTestService()
669680

670-
kubeClient, _ := k8sClient.NewFakeClientset()
671-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
681+
kubeClient := k8sfake.NewClientset()
682+
ciliumClientset := ciliumfake.NewSimpleClientset()
683+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
672684
addService(t, kubeClient, svc)
673685
addNodes(t, kubeClient, nodes)
674686
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}
@@ -730,8 +742,9 @@ func testCiliumUpdateLoadBalancerAddNodeWithNewIpHolderNamingConvention(t *testi
730742
svc := createTestService()
731743
newIpHolderInstance = createNewIpHolderInstance()
732744

733-
kubeClient, _ := k8sClient.NewFakeClientset()
734-
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &kubeClient.CiliumFakeClientset.Fake}
745+
kubeClient := k8sfake.NewClientset()
746+
ciliumClientset := ciliumfake.NewSimpleClientset()
747+
ciliumClient := &fakev2alpha1.FakeCiliumV2alpha1{Fake: &ciliumClientset.Fake}
735748
addService(t, kubeClient, svc)
736749
addNodes(t, kubeClient, nodes)
737750
lb := &loadbalancers{mc, zone, kubeClient, ciliumClient, ciliumLBType}

‎go.mod‎

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,20 @@ require (
2121
k8s.io/client-go v0.34.1
2222
k8s.io/cloud-provider v0.34.1
2323
k8s.io/component-base v0.34.1
24+
k8s.io/component-helpers v0.34.1
2425
k8s.io/klog/v2 v2.130.1
26+
k8s.io/kubernetes v1.34.1
2527
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2628
)
2729

28-
require (
29-
github.com/cloudflare/cfssl v1.6.5 // indirect
30-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
31-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
32-
github.com/onsi/gomega v1.36.1 // indirect
33-
go.yaml.in/yaml/v2 v2.4.2 // indirect
34-
go.yaml.in/yaml/v3 v3.0.4 // indirect
35-
sigs.k8s.io/randfill v1.0.0 // indirect
36-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
37-
)
38-
3930
require (
4031
cel.dev/expr v0.24.0 // indirect
4132
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4233
github.com/Masterminds/goutils v1.1.1 // indirect
43-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
34+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
4435
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
4536
github.com/NYTimes/gziphandler v1.1.1 // indirect
46-
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
37+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4738
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4839
github.com/beorn7/perks v1.0.1 // indirect
4940
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -75,6 +66,7 @@ require (
7566
github.com/go-openapi/swag v0.23.1 // indirect
7667
github.com/go-openapi/validate v0.24.0 // indirect
7768
github.com/go-resty/resty/v2 v2.16.5 // indirect
69+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
7870
github.com/gogo/protobuf v1.3.2 // indirect
7971
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8072
github.com/golang/protobuf v1.5.4 // indirect
@@ -85,27 +77,29 @@ require (
8577
github.com/google/go-querystring v1.1.0 // indirect
8678
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8779
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
88-
github.com/huandu/xstrings v1.3.3 // indirect
89-
github.com/imdario/mergo v0.3.16 // indirect
80+
github.com/huandu/xstrings v1.3.2 // indirect
81+
github.com/imdario/mergo v0.3.12 // indirect
9082
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9183
github.com/josharian/intern v1.0.0 // indirect
9284
github.com/json-iterator/go v1.1.12 // indirect
9385
github.com/kylelemons/godebug v1.1.0 // indirect
86+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
9487
github.com/mackerelio/go-osstat v0.2.6 // indirect
9588
github.com/mailru/easyjson v0.9.0 // indirect
9689
github.com/mitchellh/copystructure v1.1.2 // indirect
9790
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9891
github.com/mitchellh/mapstructure v1.5.0 // indirect
99-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
92+
github.com/mitchellh/reflectwalk v1.0.1 // indirect
10093
github.com/moby/term v0.5.2 // indirect
10194
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10295
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
10396
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
10497
github.com/oklog/ulid v1.3.1 // indirect
98+
github.com/onsi/gomega v1.36.1 // indirect
10599
github.com/opencontainers/go-digest v1.0.0 // indirect
106100
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
107101
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
108-
github.com/petermattis/goid v0.0.0-20241211131331-93ee7e083c43 // indirect
102+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
109103
github.com/pkg/errors v0.9.1 // indirect
110104
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
111105
github.com/prometheus/client_model v0.6.2 // indirect
@@ -127,7 +121,7 @@ require (
127121
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
128122
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
129123
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
130-
go.mongodb.org/mongo-driver v1.17.1 // indirect
124+
go.mongodb.org/mongo-driver v1.14.0 // indirect
131125
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
132126
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
133127
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
@@ -138,9 +132,11 @@ require (
138132
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
139133
go.opentelemetry.io/otel/trace v1.37.0 // indirect
140134
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
141-
go.uber.org/dig v1.18.0 // indirect
135+
go.uber.org/dig v1.17.1 // indirect
142136
go.uber.org/multierr v1.11.0 // indirect
143137
go.uber.org/zap v1.27.0 // indirect
138+
go.yaml.in/yaml/v2 v2.4.2 // indirect
139+
go.yaml.in/yaml/v3 v3.0.4 // indirect
144140
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
145141
golang.org/x/crypto v0.41.0 // indirect
146142
golang.org/x/mod v0.27.0 // indirect
@@ -163,33 +159,31 @@ require (
163159
gopkg.in/yaml.v3 v3.0.1 // indirect
164160
k8s.io/apiextensions-apiserver v0.33.3 // indirect
165161
k8s.io/apiserver v0.34.1 // indirect
166-
k8s.io/component-helpers v0.34.1
167162
k8s.io/controller-manager v0.34.1 // indirect
168163
k8s.io/kms v0.34.1 // indirect
169164
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
170-
k8s.io/kubelet v0.33.0 // indirect
171-
k8s.io/kubernetes v1.33.4
172-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 // indirect
165+
k8s.io/kubelet v0.0.0 // indirect
166+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
173167
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
174-
sigs.k8s.io/mcs-api v0.1.1-0.20250610011024-38bab5ba476b // indirect
168+
sigs.k8s.io/randfill v1.0.0 // indirect
169+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
175170
sigs.k8s.io/yaml v1.6.0 // indirect
176171
)
177172

178-
// Fixes for `unknown revision v0.0.0` reported by `go list -modfile=go.mod -m -json -mod=mod all`
179173
replace (
180-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.0
181-
k8s.io/cri-api => k8s.io/cri-api v0.33.0
182-
k8s.io/cri-client => k8s.io/cri-client v0.33.0
183-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.0
184-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.0
185-
k8s.io/externaljwt => k8s.io/externaljwt v0.33.0
186-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.0
187-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.0
188-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.0
189-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.0
190-
k8s.io/kubelet => k8s.io/kubelet v0.33.0
191-
k8s.io/metrics => k8s.io/metrics v0.33.0
192-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.0
193-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.0
194-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.0
174+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.1
175+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
176+
k8s.io/cri-client => k8s.io/cri-client v0.34.1
177+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.1
178+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.1
179+
k8s.io/externaljwt => k8s.io/externaljwt v0.34.1
180+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.1
181+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.1
182+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.1
183+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.1
184+
k8s.io/kubelet => k8s.io/kubelet v0.34.1
185+
k8s.io/metrics => k8s.io/metrics v0.34.1
186+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
187+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.1
188+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.1
195189
)

0 commit comments

Comments
 (0)