From f8412e062424306469c2390fb866ee369d5b8dea Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 2 Nov 2022 09:07:12 +0100 Subject: [PATCH] dependencies: update to ginkgo v2.6.1, gomega v1.24.2 Ginkgo v2.5.0 adds support for a "timeline": a full description of what happened while a specific test ran, including failures, timeouts, and log output. Ginkgo v2.6.0 adds ReportBeforeSuite which we need for https://github.com/kubernetes/kubernetes/issues/114313. Kubernetes-commit: f3ef4004317c1a12d84021be29dd5f92badc8eff --- go.mod | 25 +++++++++++++------------ go.sum | 22 ++++++---------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 97a9f2b25..22d36eb25 100644 --- a/go.mod +++ b/go.mod @@ -33,8 +33,8 @@ require ( go.opentelemetry.io/otel/trace v1.10.0 go.uber.org/zap v1.19.0 golang.org/x/crypto v0.1.0 - golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 + golang.org/x/net v0.4.0 + golang.org/x/sync v0.1.0 golang.org/x/sys v0.3.0 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 @@ -42,12 +42,12 @@ require ( google.golang.org/protobuf v1.28.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0-20221219010528-ad1a499d6e1d - k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 - k8s.io/client-go v0.0.0-20221219010852-089645a7c5f0 - k8s.io/component-base v0.0.0-20221219012036-381d35dcfb56 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.80.1 - k8s.io/kms v0.0.0-20221211033745-e78daff16094 + k8s.io/kms v0.0.0 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 @@ -122,9 +122,10 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20221219010528-ad1a499d6e1d - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 - k8s.io/client-go => k8s.io/client-go v0.0.0-20221219010852-089645a7c5f0 - k8s.io/component-base => k8s.io/component-base v0.0.0-20221219012036-381d35dcfb56 - k8s.io/kms => k8s.io/kms v0.0.0-20221211033745-e78daff16094 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kms => ../kms ) diff --git a/go.sum b/go.sum index fdc48985f..ce85a7cc4 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= -github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= +github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q= +github.com/onsi/gomega v1.24.2 h1:J/tulyYK6JwBldPViHJReihxxZ+22FHs0piGjQAvoUE= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -626,8 +626,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -657,8 +657,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -988,18 +988,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20221219010528-ad1a499d6e1d h1:pLcGP0OWdNnJdcHC/z7Igu/otNTq0VmiYjhO350ZY78= -k8s.io/api v0.0.0-20221219010528-ad1a499d6e1d/go.mod h1:duiNr/01XR5q9e9KOuBRyaJ4Fo4tatH5EcaDCWcLhRI= -k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650 h1:j8J1YsXNcg2kTBShe5PCLQxE2DWldFTNyk/Xa71GXjs= -k8s.io/apimachinery v0.0.0-20221218214745-cc480d329650/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= -k8s.io/client-go v0.0.0-20221219010852-089645a7c5f0 h1:/+JHkiuQAQW2VVolBxF13CAcKW/r08AUCV7epWbHFXE= -k8s.io/client-go v0.0.0-20221219010852-089645a7c5f0/go.mod h1:1oMdrIbWmvwwPR3LfMV2xCEeYwypUUhEJMAJWw7nLLM= -k8s.io/component-base v0.0.0-20221219012036-381d35dcfb56 h1:4Oq8TdzsIEGbOAAw6ZSsJtTLiKcCZ6mnUaZ8stUVPSc= -k8s.io/component-base v0.0.0-20221219012036-381d35dcfb56/go.mod h1:TSNN+2W9vakMAp4oqVnsHsIQexmQDo1YAWsp6RJSLU4= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.0.0-20221211033745-e78daff16094 h1:AdkIdoSzQfSf/O/ruPz1eVncbg9vuJ8rErseaVuoTBQ= -k8s.io/kms v0.0.0-20221211033745-e78daff16094/go.mod h1:VfJSvsOZlWkHLK5xrpRtl2sOPId3nokhawvz2caAK2Y= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=