From 97aaf77b3ddd475e7f9e9138cf742c4f02dae847 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 | 29 +++++++++++++++-------------- go.sum | 13 ++----------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 04a1510..1b4adc3 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager go 1.19 require ( - k8s.io/apimachinery v0.0.0-20221207014915-9bd0499e768a - k8s.io/cloud-provider v0.0.0-20221207034137-ef625d5e675d - k8s.io/controller-manager v0.0.0-20221207033830-b2ce916fcd90 + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) require ( @@ -17,11 +17,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect + golang.org/x/net v0.4.0 // indirect golang.org/x/text v0.5.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.0.0-20221207022911-5a27a217e76d // indirect + k8s.io/component-base v0.0.0 // indirect k8s.io/klog/v2 v2.80.1 // indirect k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect @@ -29,13 +29,14 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20221207015603-ed9fa272abb9 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221207014915-9bd0499e768a - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221207023944-d57d8216e108 - k8s.io/client-go => k8s.io/client-go v0.0.0-20221207020356-6cbd19f22fe1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221207034137-ef625d5e675d - k8s.io/component-base => k8s.io/component-base v0.0.0-20221207022911-5a27a217e76d - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221207023249-ee02082c9cce - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221207033830-b2ce916fcd90 - k8s.io/kms => k8s.io/kms v0.0.0-20221207023524-ba41d7b79a8d + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/cloud-provider => ../cloud-provider + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/controller-manager => ../controller-manager + k8s.io/kms => ../kms + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index 3e581bd..7089801 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -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/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -66,15 +66,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -k8s.io/api v0.0.0-20221207015603-ed9fa272abb9 h1:HLAJNDewiVFOPssbWj15wbBwf+hux5vvKmb/IPOYRA0= -k8s.io/apimachinery v0.0.0-20221207014915-9bd0499e768a h1:fTLcpcQ80F7+fAF/GSC2IWZAD1V3NcOy4kO0kdDRujQ= -k8s.io/apimachinery v0.0.0-20221207014915-9bd0499e768a/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= -k8s.io/cloud-provider v0.0.0-20221207034137-ef625d5e675d h1:xaA7R4Q98XM0tahhQOw+bEtHk/jI93mk8UQ+CWe+7HI= -k8s.io/cloud-provider v0.0.0-20221207034137-ef625d5e675d/go.mod h1:EBSwFKUfyLTapgddOMfzdm3eOoH3Kc1h3bKrvaRI+zs= -k8s.io/component-base v0.0.0-20221207022911-5a27a217e76d h1:EFaKqZSBLxj6YLvdCsvv+Lj3XNtSR1C7I2qO5AGB0ow= -k8s.io/component-base v0.0.0-20221207022911-5a27a217e76d/go.mod h1:ZFqADngLrzbcXx0C7c+Tx7JQ5clFSVl7Vw/y/hJZqzM= -k8s.io/controller-manager v0.0.0-20221207033830-b2ce916fcd90 h1:QhCUaFeFF65FNuVFiqh7N3RdgG6+PEWIPw9xUDAqawY= -k8s.io/controller-manager v0.0.0-20221207033830-b2ce916fcd90/go.mod h1:0j3+us+msK9Bzoq3RNjRXZJ92o+nkmtRprwBHSEdUfA= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=