From 5cb9c8fd4ac4cc5319c165eff9957c806762f05d Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 24 Oct 2022 13:43:15 +0200 Subject: [PATCH] dependencies: update to gomega v1.23.0 and ginkgo v2.4.0 and dependencies Gomega adds support for formatting extensions and StopTrying in matchers. Ginkgo enhances DeferCleanup. This also triggered an update of other dependencies. Kubernetes-commit: e6ad2f2f23449c9d24606b864c4737dc66a7427e --- go.mod | 35 ++++++++++++++++++----------------- go.sum | 22 ++++------------------ 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 85ea9d768..72dcda494 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/lithammer/dedent v1.1.0 github.com/mitchellh/go-wordwrap v1.0.0 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 - github.com/onsi/ginkgo/v2 v2.3.1 - github.com/onsi/gomega v1.22.1 + github.com/onsi/ginkgo/v2 v2.4.0 + github.com/onsi/gomega v1.23.0 github.com/pkg/errors v0.9.1 github.com/russross/blackfriday/v2 v2.1.0 github.com/spf13/cobra v1.6.0 @@ -29,15 +29,15 @@ require ( github.com/stretchr/testify v1.8.0 golang.org/x/sys v0.1.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20221028075226-689257039cfb - k8s.io/apimachinery v0.0.0-20221028075009-0524d6c61445 - k8s.io/cli-runtime v0.0.0-20221028082309-76d40a058aae - k8s.io/client-go v0.0.0-20221028075543-f87d0472f2aa - k8s.io/component-base v0.0.0-20221028080536-8a0b021ace32 - k8s.io/component-helpers v0.0.0-20221028080644-2772ed776e6b + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/component-helpers v0.0.0 k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 - k8s.io/metrics v0.0.0-20221028082151-6c2b09dbf767 + k8s.io/metrics v0.0.0 k8s.io/utils v0.0.0-20220922133306-665eaaec4324 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 @@ -91,12 +91,13 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20221028075226-689257039cfb - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221028075009-0524d6c61445 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20221028082309-76d40a058aae - k8s.io/client-go => k8s.io/client-go v0.0.0-20221028075543-f87d0472f2aa - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221028074805-300cdcfe6cbe - k8s.io/component-base => k8s.io/component-base v0.0.0-20221028080536-8a0b021ace32 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221028080644-2772ed776e6b - k8s.io/metrics => k8s.io/metrics v0.0.0-20221028082151-6c2b09dbf767 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/kubectl => ../kubectl + k8s.io/metrics => ../metrics ) diff --git a/go.sum b/go.sum index de02c7927..ed753d48a 100644 --- a/go.sum +++ b/go.sum @@ -211,10 +211,10 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= 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/onsi/ginkgo/v2 v2.3.1 h1:8SbseP7qM32WcvE6VaN6vfXxv698izmsJ1UQX9ve7T8= -github.com/onsi/ginkgo/v2 v2.3.1/go.mod h1:Sv4yQXwG5VmF7tm3Q5Z+RWUpPo24LF1mpnz2crUb8Ys= -github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI= -github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= +github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= +github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= +github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -540,24 +540,10 @@ 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-20221028075226-689257039cfb h1:QZsHf1k3xHSbYozSHt8DZOrH36F8MbdLP18n4ZkQ/1c= -k8s.io/api v0.0.0-20221028075226-689257039cfb/go.mod h1:96woDPRgmgH0tVTXgsLdv0cwHXPUvZ97ghr8sMUtxx0= -k8s.io/apimachinery v0.0.0-20221028075009-0524d6c61445 h1:hXu9HT0t7U8yoa+ag/YUgy2/7yj0NvlVHbHjqw1R3qs= -k8s.io/apimachinery v0.0.0-20221028075009-0524d6c61445/go.mod h1:nG4gaqgN0dCXlF11Oh/vA7GosujtSKqnr19oq8ag6qA= -k8s.io/cli-runtime v0.0.0-20221028082309-76d40a058aae h1:phqrhTIhN89dieCciPqSOFn2AUFK/WhRMNxsP9rg9AE= -k8s.io/cli-runtime v0.0.0-20221028082309-76d40a058aae/go.mod h1:8Za6U2FoTs3UoLXV5Q8VJIpf4bJypigmS2rfXgvwaH4= -k8s.io/client-go v0.0.0-20221028075543-f87d0472f2aa h1:9+11V9Ct7evjC9yl+E3qfBgJi21lzG9VHpwzCx0yrIw= -k8s.io/client-go v0.0.0-20221028075543-f87d0472f2aa/go.mod h1:hg9A6iQF4ggK+BmrByy91yyQ/gkUlEPXQEfJYh4iWM8= -k8s.io/component-base v0.0.0-20221028080536-8a0b021ace32 h1:946PoIsYY1KmbwEegl4FTNc5vKfW/CiwS/Kyungjk1Y= -k8s.io/component-base v0.0.0-20221028080536-8a0b021ace32/go.mod h1:sh1BJWuuPvAp6N9fYbCb1wCYAV0975MilaZ3r31/JL0= -k8s.io/component-helpers v0.0.0-20221028080644-2772ed776e6b h1:DZAb78T4peMvHgyptRf1gokFWRJg1LeCT+Ne61r7S2k= -k8s.io/component-helpers v0.0.0-20221028080644-2772ed776e6b/go.mod h1:om2icnD6V7eQE5dFLiSKDrpnKtsgorbGjJX0mUSx/ww= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= 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/metrics v0.0.0-20221028082151-6c2b09dbf767 h1:ZiHo2NMFeUb50eDPQk2g2iRShGFoQ8yyvuFEoHCC5PY= -k8s.io/metrics v0.0.0-20221028082151-6c2b09dbf767/go.mod h1:zvn34LjwRWVMIyjVKKVTuRMno8O2NkMajv1sY1u/a+M= k8s.io/utils v0.0.0-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI= k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=