From 1f2243c8e62e4cdba9efef6376c59f56153d0492 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Mon, 7 Nov 2022 19:30:21 +0000 Subject: [PATCH] update k8s.io/utils to fix util tracing panic Kubernetes-commit: 3f1511c8e9a64cf60821036aa1fc3ec9d58a2931 --- go.mod | 29 +++++++++++++++-------------- go.sum | 13 ++----------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index d03022a..9084086 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-20221028075009-0524d6c61445 - k8s.io/cloud-provider v0.0.0-20221028083011-d0814caef9b1 - k8s.io/controller-manager v0.0.0-20221028082853-1c1d0d7d18f8 + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) require ( @@ -21,21 +21,22 @@ require ( golang.org/x/text v0.4.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-20221028080536-8a0b021ace32 // indirect + k8s.io/component-base v0.0.0 // indirect k8s.io/klog/v2 v2.80.1 // indirect - k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect + k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) 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/apiserver => k8s.io/apiserver v0.0.0-20221028081120-11847e4ad6b1 - k8s.io/client-go => k8s.io/client-go v0.0.0-20221028075543-f87d0472f2aa - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221028083011-d0814caef9b1 - 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/controller-manager => k8s.io/controller-manager v0.0.0-20221028082853-1c1d0d7d18f8 - k8s.io/kms => k8s.io/kms v0.0.0-20221028080743-a9ba1c11c0c6 + 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 b9f007e..75b1d79 100644 --- a/go.sum +++ b/go.sum @@ -66,19 +66,10 @@ 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-20221028075226-689257039cfb h1:QZsHf1k3xHSbYozSHt8DZOrH36F8MbdLP18n4ZkQ/1c= -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/cloud-provider v0.0.0-20221028083011-d0814caef9b1 h1:faL4GRrJXKNt+dDTug4JVf3UL/Fwd8oWktyijq6WRbc= -k8s.io/cloud-provider v0.0.0-20221028083011-d0814caef9b1/go.mod h1:zXUstWLkvXtWxSzdnqs8sM0Xc3hrJmBWTnQANOZd6v8= -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/controller-manager v0.0.0-20221028082853-1c1d0d7d18f8 h1:nntgX0Ndua9vJYbJbD8GhAPEbrWJrNK+DhNMxKYa3V0= -k8s.io/controller-manager v0.0.0-20221028082853-1c1d0d7d18f8/go.mod h1:vdD0kYdkYFnsHLMLswOoYyeUN2ximAV/ZX4M+Ez9+lA= 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-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI= -k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=