Skip to content

Commit 23a8b03

Browse files
authored
Merge pull request #537 from thomasferrandiz/bump-k8s-deps
Bump k8s deps
2 parents 467b3c2 + f7c3ef9 commit 23a8b03

File tree

1,934 files changed

+129507
-65033
lines changed

Some content is hidden

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

1,934 files changed

+129507
-65033
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Generate code
3838
if: steps.changed-files.outputs.any_changed == 'true'
39-
run: chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh && ./hack/generate-code.sh && hack/verify-codegen.sh
39+
run: ./hack/generate-code.sh && hack/verify-codegen.sh
4040

4141
- name: Run go fmt
4242
if: steps.changed-files.outputs.any_changed == 'true'

cmd/controlloop/controlloop.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
nadclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned"
2020
nadinformers "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions"
2121

22-
wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
23-
wbinformers "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/informers/externalversions"
2422
"github.com/k8snetworkplumbingwg/whereabouts/pkg/controlloop"
23+
wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
24+
wbinformers "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/informers/externalversions"
2525
"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
2626
"github.com/k8snetworkplumbingwg/whereabouts/pkg/reconciler"
2727
)

cmd/nodeslicecontroller/node_slice_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"k8s.io/client-go/tools/clientcmd"
1414
"k8s.io/klog/v2"
1515

16-
clientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
17-
informers "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/informers/externalversions"
16+
clientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
17+
informers "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/informers/externalversions"
1818
node_controller "github.com/k8snetworkplumbingwg/whereabouts/pkg/node-controller"
1919
"github.com/k8snetworkplumbingwg/whereabouts/pkg/node-controller/signals"
2020
)

cmd/whereabouts_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525

2626
"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
2727
"github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"
28-
wbclientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
29-
"github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned/fake"
3028
"github.com/k8snetworkplumbingwg/whereabouts/pkg/config"
29+
wbclientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
30+
"github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned/fake"
3131
"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage/kubernetes"
3232
whereaboutstypes "github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
3333
)

e2e/client/whereabouts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
"github.com/k8snetworkplumbingwg/whereabouts/e2e/entities"
1919
whereaboutscnicncfiov1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"
20-
wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
20+
wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
2121
)
2222

2323
const (

go.mod

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,38 @@ require (
1313
github.com/onsi/gomega v1.36.0
1414
github.com/pkg/errors v0.9.1
1515
gomodules.xyz/jsonpatch/v2 v2.4.0
16-
k8s.io/api v0.29.3
17-
k8s.io/apimachinery v0.29.3
18-
k8s.io/client-go v0.29.2
19-
k8s.io/code-generator v0.29.2
20-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
16+
k8s.io/api v0.31.3
17+
k8s.io/apimachinery v0.31.3
18+
k8s.io/client-go v0.31.3
19+
k8s.io/code-generator v0.31.3
20+
k8s.io/kube-openapi v0.0.0-20241127205056-99599406b04f
2121
)
2222

2323
require github.com/go-co-op/gocron/v2 v2.12.4
2424

2525
require (
2626
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27-
github.com/google/gnostic-models v0.6.8 // indirect
27+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28+
github.com/google/gnostic-models v0.6.9 // indirect
2829
github.com/jonboulle/clockwork v0.4.0 // indirect
2930
github.com/robfig/cron/v3 v3.0.1 // indirect
3031
github.com/vishvananda/netns v0.0.4 // indirect
32+
github.com/x448/float16 v0.8.4 // indirect
3133
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
3234
golang.org/x/sync v0.8.0 // indirect
35+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
36+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
3337
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
3438
)
3539

3640
require (
37-
github.com/davecgh/go-spew v1.1.1 // indirect
41+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3842
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3943
github.com/fsnotify/fsnotify v1.8.0
4044
github.com/go-logr/logr v1.4.2 // indirect
41-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
45+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4246
github.com/go-openapi/jsonreference v0.20.2 // indirect
43-
github.com/go-openapi/swag v0.22.3 // indirect
47+
github.com/go-openapi/swag v0.23.0 // indirect
4448
github.com/gogo/protobuf v1.3.2 // indirect
4549
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4650
github.com/golang/protobuf v1.5.4 // indirect
@@ -56,23 +60,21 @@ require (
5660
github.com/spf13/pflag v1.0.5 // indirect
5761
golang.org/x/mod v0.21.0 // indirect
5862
golang.org/x/net v0.30.0 // indirect
59-
golang.org/x/oauth2 v0.10.0 // indirect
63+
golang.org/x/oauth2 v0.21.0 // indirect
6064
golang.org/x/sys v0.27.0 // indirect
6165
golang.org/x/term v0.25.0 // indirect
6266
golang.org/x/text v0.19.0 // indirect
6367
golang.org/x/time v0.8.0
6468
golang.org/x/tools v0.26.0 // indirect
65-
google.golang.org/appengine v1.6.7 // indirect
6669
google.golang.org/protobuf v1.35.1 // indirect
6770
gopkg.in/inf.v0 v0.9.1 // indirect
6871
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6972
gopkg.in/yaml.v2 v2.4.0 // indirect
7073
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
7274
k8s.io/klog/v2 v2.130.1
73-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
75-
sigs.k8s.io/yaml v1.3.0 // indirect
75+
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
76+
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
77+
sigs.k8s.io/yaml v1.4.0 // indirect
7678
)
7779

7880
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2

0 commit comments

Comments
 (0)