Merge pull request #112545 from dims/update-etcd-3.5.5-and-all-otel-related-to-latest

Update etcd 3.5.5 and all otel related libraries to newer versions

Kubernetes-commit: 6820a383be4a1bbb5cd526eb3aeb9e6ade351498
This commit is contained in:
Kubernetes Publisher 2022-09-19 19:15:31 -07:00
commit 6e2d4cb05e
2 changed files with 41 additions and 38 deletions

36
go.mod
View File

@ -14,7 +14,7 @@ require (
github.com/fatih/camelcase v1.0.0
github.com/fvbommel/sortorder v1.0.1
github.com/google/gnostic v0.5.7-v3refs
github.com/google/go-cmp v0.5.8
github.com/google/go-cmp v0.5.9
github.com/jonboulle/clockwork v0.2.2
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
github.com/lithammer/dedent v1.1.0
@ -26,18 +26,18 @@ require (
github.com/russross/blackfriday v1.5.2
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.0
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220916032116-c98ebf18d366
k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812
k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814
k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1
k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd
k8s.io/api v0.0.0-20220920024110-052d63f042d1
k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e
k8s.io/cli-runtime v0.0.0-20220920030452-57e3a82625fb
k8s.io/client-go v0.0.0-20220920024403-f7c9c639d451
k8s.io/component-base v0.0.0-20220920025012-1b02e586f291
k8s.io/component-helpers v0.0.0-20220920025106-53ccb1c5fe17
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/metrics v0.0.0-20220919115431-9ea68bfb2057
k8s.io/metrics v0.0.0-20220920030340-6f5cda96514e
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@ -50,7 +50,7 @@ require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@ -93,12 +93,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220916032116-c98ebf18d366
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812
k8s.io/client-go => k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220919103714-b54a056c2b87
k8s.io/component-base => k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd
k8s.io/metrics => k8s.io/metrics v0.0.0-20220919115431-9ea68bfb2057
k8s.io/api => k8s.io/api v0.0.0-20220920024110-052d63f042d1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220920030452-57e3a82625fb
k8s.io/client-go => k8s.io/client-go v0.0.0-20220920024403-f7c9c639d451
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220920023722-4ca0baf2d316
k8s.io/component-base => k8s.io/component-base v0.0.0-20220920025012-1b02e586f291
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220920025106-53ccb1c5fe17
k8s.io/metrics => k8s.io/metrics v0.0.0-20220920030340-6f5cda96514e
)

43
go.sum
View File

@ -63,8 +63,8 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw=
github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@ -142,8 +142,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -243,13 +243,16 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@ -543,25 +546,25 @@ 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-20220916032116-c98ebf18d366 h1:QbCp5XhHlMsvZk+yaV4hwqfq48NJTYUs3N6OOKWaSlU=
k8s.io/api v0.0.0-20220916032116-c98ebf18d366/go.mod h1:mgirip+ylRYNjZVz7OqYQtrEdhksbpM2LSSH/QNc3wg=
k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf h1:DqaEXPQPvHjswRaBllqESFzhqKQzei4jsx//mW6zd10=
k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf/go.mod h1:cDOY42/LxGj6qgx5SDz+nj31Q2Thcdcq0BhBZAocaEY=
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812 h1:mbNy/DNFTZhwURg5iq1SgGqcVJPtVCd5Ye8dnmP0WKg=
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812/go.mod h1:VNSlkRvUTUdIfrZikvh+1F0uJyRlLclE7JwYraYvIMk=
k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814 h1:0hiN1W5eOHXAd6HujAvCI5pKUV1O3dGkCobTxPQxxDk=
k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814/go.mod h1:Hxvu1YDSNPtbVEc8cPWCqSI5g45QtT8f6Z+BSuJklvA=
k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1 h1:0WcjVTLbiRLFQOQD9ywMSpVuLX950S52U1VGGXdYeBY=
k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1/go.mod h1:0xsQ70gY+fwfAWX2I0nwD9sSSpMmDRTGhIDyKG6l+1E=
k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd h1:8EKCkeAlRDs4k01fW9bWKSSuSVgW+IU+V2DukqwTgHs=
k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd/go.mod h1:1EGJYo1wSdRACFXzZhyGBrQ640YKgARbrcHA0PdAH/k=
k8s.io/api v0.0.0-20220920024110-052d63f042d1 h1:AVf/MIDCtju3ewzQ8MGvS3E6Milhn9Bz3+fo/rgAspo=
k8s.io/api v0.0.0-20220920024110-052d63f042d1/go.mod h1:TCn8BrGoJbxQ9QglNsNhQ/1gFy4cEQ912+2vx6tJD9s=
k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e h1:gkaJe0+f48lrEpQj6xocjdA9XgPyXef+OEqnt+3HgkI=
k8s.io/apimachinery v0.0.0-20220920023906-f8159af4957e/go.mod h1:YxcSfgHt+jqvurbA0MLOvpo1OlrnkzW3sZTxMu+hrgI=
k8s.io/cli-runtime v0.0.0-20220920030452-57e3a82625fb h1:tfnHSQOlhELzK4Fwj+N8KnBzD/ztXDpIOsjApCOIg/M=
k8s.io/cli-runtime v0.0.0-20220920030452-57e3a82625fb/go.mod h1:bjRcl6+DJ0kz6PhAvtJw+crQpFHyPNypfUoQyUqwBd4=
k8s.io/client-go v0.0.0-20220920024403-f7c9c639d451 h1:14ujpkyYCtumyzstens4CBoPd1v6idLN4ev1J1ZVU2A=
k8s.io/client-go v0.0.0-20220920024403-f7c9c639d451/go.mod h1:qzy1OswsNEtlrimwo3ar0C/e54RA+bLf36X7t+yWr9o=
k8s.io/component-base v0.0.0-20220920025012-1b02e586f291 h1:q6tGa3aF42U9ZTw8lEHCYd6LAV5G2IVugDkhuIT8Aqk=
k8s.io/component-base v0.0.0-20220920025012-1b02e586f291/go.mod h1:OiJOaAZFFvxFaKaqMUbA1vuWD1H1DVpQjmJXN0xeSJk=
k8s.io/component-helpers v0.0.0-20220920025106-53ccb1c5fe17 h1:7BIeNfBXD3u1sScseVNnuisf82xtXs6x+D0b9S5b1qg=
k8s.io/component-helpers v0.0.0-20220920025106-53ccb1c5fe17/go.mod h1:l8jywpfFZc62NpNuZ4EV/y8NsAN2NqjAlgnUmFjTppc=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
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-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
k8s.io/metrics v0.0.0-20220919115431-9ea68bfb2057 h1:qEl+Dojx7SvTfpbv+l+vF5B8yUjsBIKDJFIitnsDUBk=
k8s.io/metrics v0.0.0-20220919115431-9ea68bfb2057/go.mod h1:OWm2J3CAH/XLEsf9rw4vpxOrvjvRQTyvXCHznNRDCrg=
k8s.io/metrics v0.0.0-20220920030340-6f5cda96514e h1:S7tcoLVMcMYADy2qZfe3CUatmuTPqCswsfgXKlmpWU8=
k8s.io/metrics v0.0.0-20220920030340-6f5cda96514e/go.mod h1:fmQh4ADpmMRn5toWxjhhbiIX3f0OYKSyiyflHlM9/s8=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=