Skip to content

Commit 88a997a

Browse files
authored
Merge pull request kubernetes#128481 from carlory/dependencies-ginkgo-gomega
dependencies: ginkgo v2.21.0, gomega v1.35.1
2 parents 1a16c2d + f36042d commit 88a997a

File tree

129 files changed

+1156
-1823
lines changed

Some content is hidden

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

129 files changed

+1156
-1823
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ require (
4646
github.com/moby/sys/userns v0.1.0
4747
github.com/mrunalp/fileutils v0.5.1
4848
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
49-
github.com/onsi/ginkgo/v2 v2.19.0
50-
github.com/onsi/gomega v1.33.1
49+
github.com/onsi/ginkgo/v2 v2.21.0
50+
github.com/onsi/gomega v1.35.1
5151
github.com/opencontainers/runc v1.1.15
5252
github.com/opencontainers/selinux v1.11.0
5353
github.com/pkg/errors v0.9.1
@@ -83,7 +83,7 @@ require (
8383
golang.org/x/tools v0.26.0
8484
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094
8585
google.golang.org/grpc v1.65.0
86-
google.golang.org/protobuf v1.34.2
86+
google.golang.org/protobuf v1.35.1
8787
gopkg.in/evanphx/json-patch.v4 v4.12.0
8888
gopkg.in/square/go-jose.v2 v2.6.0
8989
k8s.io/api v0.0.0
@@ -157,7 +157,7 @@ require (
157157
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
158158
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
159159
github.com/google/btree v1.0.1 // indirect
160-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
160+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
161161
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
162162
github.com/gorilla/websocket v1.5.0 // indirect
163163
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
322322
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
323323
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
324324
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
325-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
326-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
325+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
326+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
327327
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
328328
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
329329
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -411,10 +411,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
411411
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
412412
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
413413
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
414-
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
415-
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
416-
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
417-
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
414+
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
415+
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
416+
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
417+
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
418418
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
419419
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
420420
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
@@ -672,8 +672,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
672672
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
673673
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
674674
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
675-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
676-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
675+
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
676+
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
677677
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
678678
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
679679
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

staging/src/k8s.io/api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/x448/float16 v0.8.4 // indirect
2828
golang.org/x/net v0.30.0 // indirect
2929
golang.org/x/text v0.19.0 // indirect
30-
google.golang.org/protobuf v1.34.2 // indirect
30+
google.golang.org/protobuf v1.35.1 // indirect
3131
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
3232
gopkg.in/inf.v0 v0.9.1 // indirect
3333
k8s.io/klog/v2 v2.130.1 // indirect

staging/src/k8s.io/api/go.sum

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
go.opentelemetry.io/otel v1.28.0
2424
go.opentelemetry.io/otel/trace v1.28.0
2525
google.golang.org/grpc v1.65.0
26-
google.golang.org/protobuf v1.34.2
26+
google.golang.org/protobuf v1.35.1
2727
gopkg.in/evanphx/json-patch.v4 v4.12.0
2828
k8s.io/api v0.0.0
2929
k8s.io/apimachinery v0.0.0

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/google/uuid v1.6.0
1919
github.com/moby/spdystream v0.5.0
2020
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
21-
github.com/onsi/ginkgo/v2 v2.19.0
21+
github.com/onsi/ginkgo/v2 v2.21.0
2222
github.com/spf13/pflag v1.0.5
2323
github.com/stretchr/testify v1.9.0
2424
golang.org/x/net v0.30.0
@@ -39,19 +39,20 @@ require (
3939
github.com/go-openapi/jsonreference v0.20.2 // indirect
4040
github.com/go-openapi/swag v0.23.0 // indirect
4141
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
42-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
42+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4343
github.com/josharian/intern v1.0.0 // indirect
4444
github.com/json-iterator/go v1.1.12 // indirect
4545
github.com/mailru/easyjson v0.7.7 // indirect
4646
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4747
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/onsi/gomega v1.35.1 // indirect
4849
github.com/pkg/errors v0.9.1 // indirect
4950
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5051
github.com/x448/float16 v0.8.4 // indirect
5152
golang.org/x/sys v0.26.0 // indirect
5253
golang.org/x/text v0.19.0 // indirect
5354
golang.org/x/tools v0.26.0 // indirect
54-
google.golang.org/protobuf v1.34.2 // indirect
55+
google.golang.org/protobuf v1.35.1 // indirect
5556
gopkg.in/yaml.v2 v2.4.0 // indirect
5657
gopkg.in/yaml.v3 v3.0.1 // indirect
5758
)

staging/src/k8s.io/apimachinery/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
golang.org/x/time v0.7.0
4747
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
4848
google.golang.org/grpc v1.65.0
49-
google.golang.org/protobuf v1.34.2
49+
google.golang.org/protobuf v1.35.1
5050
gopkg.in/evanphx/json-patch.v4 v4.12.0
5151
gopkg.in/natefinch/lumberjack.v2 v2.2.1
5252
gopkg.in/square/go-jose.v2 v2.6.0

0 commit comments

Comments
 (0)