From abdc0eb56a1d0976c8ddf93573d3f9afa2fd9186 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 7 Nov 2022 16:02:00 -0800 Subject: [PATCH] Merge pull request #113688 from dashpole/update_utils Update k8s.io/utils to fix util tracing panic Kubernetes-commit: fa2e203a6bde89a84443ee9813e1f27aa31326a9 --- go.mod | 13 ++++++------- go.sum | 6 ++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 09a4b00c..bc4453b1 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( go.opentelemetry.io/otel/trace v1.10.0 go.uber.org/zap v1.19.0 golang.org/x/sys v0.1.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 + k8s.io/apimachinery v0.0.0-20221108052757-4fe4321a9d5e + k8s.io/client-go v0.0.0-20221108054908-3daf180aa6b1 k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 @@ -77,15 +77,14 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect - k8s.io/api v0.0.0 // indirect + k8s.io/api v0.0.0-20221108053747-3f61c95cab71 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base + k8s.io/api => k8s.io/api v0.0.0-20221108053747-3f61c95cab71 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221108052757-4fe4321a9d5e + k8s.io/client-go => k8s.io/client-go v0.0.0-20221108054908-3daf180aa6b1 ) diff --git a/go.sum b/go.sum index da01cbd7..a14371ac 100644 --- a/go.sum +++ b/go.sum @@ -661,6 +661,12 @@ 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-20221108053747-3f61c95cab71 h1:pyiHUA+hk/Uld88AATDzP+rOHuHoUvQVDosQmOGGT/w= +k8s.io/api v0.0.0-20221108053747-3f61c95cab71/go.mod h1:PSXY9/fSNyKgKHUU+O9scnZiW8m+V1znqk49oI6hAEY= +k8s.io/apimachinery v0.0.0-20221108052757-4fe4321a9d5e h1:zX/AC2CNrYwngyVHVHcsCL36uUtC/3tiZOE6/gfojvc= +k8s.io/apimachinery v0.0.0-20221108052757-4fe4321a9d5e/go.mod h1:VXMmlsE7YRJ5vyAyWpkKIfFkEbDNpVs0ObpkuQf1WfM= +k8s.io/client-go v0.0.0-20221108054908-3daf180aa6b1 h1:0kFOheClgHsssAuquQ5SUM5vDTS8tSaSjv+9J1UXTnI= +k8s.io/client-go v0.0.0-20221108054908-3daf180aa6b1/go.mod h1:nLJ8OQ/Q/icQcfjnVrKZyCgc/CPXX7o8Hlqh70Oo6Jk= 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=