Merge pull request #121338 from dims/working-otel-bump

Bump otel and other dependencies for CVE-2023-45142

Kubernetes-commit: d0084356b3cabdafcfc140d19ad8d544b2fc9b5d
This commit is contained in:
Kubernetes Publisher 2023-10-26 08:34:47 +02:00
commit e8aab9cee9
2 changed files with 42 additions and 36 deletions

36
go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/kubectl
go 1.20
go 1.21.3
require (
github.com/MakeNowJust/heredoc v1.0.0
@ -27,18 +27,18 @@ require (
github.com/russross/blackfriday/v2 v2.1.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.3
github.com/stretchr/testify v1.8.4
golang.org/x/sys v0.13.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20231024171239-3942070de4fb
k8s.io/apimachinery v0.0.0-20231024171030-c18d2bfed439
k8s.io/cli-runtime v0.0.0-20231024042735-7a5787c1f8c2
k8s.io/client-go v0.0.0-20231024171543-e2e59f3539ef
k8s.io/component-base v0.0.0-20231025211718-5d0caec7619f
k8s.io/component-helpers v0.0.0-20231020235215-606f6e27cff2
k8s.io/api v0.0.0-20231026091235-25009ae79765
k8s.io/apimachinery v0.0.0-20231026091025-0785eb2fbd30
k8s.io/cli-runtime v0.0.0-20231026093925-b52809d51a06
k8s.io/client-go v0.0.0-20231026091529-4028f5ba6e18
k8s.io/component-base v0.0.0-20231026092130-42e32587411a
k8s.io/component-helpers v0.0.0-20231026092244-9d021fe8f7bd
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
k8s.io/metrics v0.0.0-20231021010548-6bb8d4fc3e8e
k8s.io/metrics v0.0.0-20231026093805-3bb5742de9b7
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3
@ -82,7 +82,7 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
@ -96,12 +96,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20231024171239-3942070de4fb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231024171030-c18d2bfed439
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20231024042735-7a5787c1f8c2
k8s.io/client-go => k8s.io/client-go v0.0.0-20231024171543-e2e59f3539ef
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231024034032-0f8102fa0710
k8s.io/component-base => k8s.io/component-base v0.0.0-20231025211718-5d0caec7619f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20231020235215-606f6e27cff2
k8s.io/metrics => k8s.io/metrics v0.0.0-20231021010548-6bb8d4fc3e8e
k8s.io/api => k8s.io/api v0.0.0-20231026091235-25009ae79765
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231026091025-0785eb2fbd30
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20231026093925-b52809d51a06
k8s.io/client-go => k8s.io/client-go v0.0.0-20231026091529-4028f5ba6e18
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231026090828-f0a605abe6c7
k8s.io/component-base => k8s.io/component-base v0.0.0-20231026092130-42e32587411a
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20231026092244-9d021fe8f7bd
k8s.io/metrics => k8s.io/metrics v0.0.0-20231026093805-3bb5742de9b7
)

42
go.sum
View File

@ -5,6 +5,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk=
github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=
@ -15,6 +16,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -110,6 +112,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@ -151,9 +154,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@ -168,8 +173,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@ -186,6 +191,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -198,8 +204,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -276,24 +282,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20231024171239-3942070de4fb h1:W3TExF0X+3mCONMf4XRR57TeKOolwMJjmzRsN6iVhSo=
k8s.io/api v0.0.0-20231024171239-3942070de4fb/go.mod h1:2u+JqiZkR4vuonY52HtvoOIEYMD6aNQHYL9GacJGfJE=
k8s.io/apimachinery v0.0.0-20231024171030-c18d2bfed439 h1:/oxbLzC7mkHNdeFI8AMsTPTwudQu7sz7rnPGIxv2yqM=
k8s.io/apimachinery v0.0.0-20231024171030-c18d2bfed439/go.mod h1:mdlGhJWO1mhVzQXm1Lx7D1BvvBIVKlRVy0vvl1LwGjg=
k8s.io/cli-runtime v0.0.0-20231024042735-7a5787c1f8c2 h1:joPkHUx9n26GJj3rmQn/vebDK58bjWFCjQhw3jbTAz4=
k8s.io/cli-runtime v0.0.0-20231024042735-7a5787c1f8c2/go.mod h1:unBeO/pUYLN/9vAOaeXW8RLHPO99g8NPadjeFvvSI5U=
k8s.io/client-go v0.0.0-20231024171543-e2e59f3539ef h1:dx12CsKyk2cct0NtF7fHMX8cOzb1uJhI5wn2sQDpr60=
k8s.io/client-go v0.0.0-20231024171543-e2e59f3539ef/go.mod h1:3HC2qEcjQxIt5UW1R7vC5RX2sf/wkRWovfAEPkbmPxA=
k8s.io/component-base v0.0.0-20231025211718-5d0caec7619f h1:2Fnnk/pl0iOuzJGqZl5UnPOFogobd/DLkfcwKH7hYCE=
k8s.io/component-base v0.0.0-20231025211718-5d0caec7619f/go.mod h1:Zq2/el1+1Nx1KR3QGkYSmEE+wGV4gPCxZYk1RsZgaTk=
k8s.io/component-helpers v0.0.0-20231020235215-606f6e27cff2 h1:UU4HaZWw14RLLGdOqFR0aWe0zIHS+b8KOGXTSkii4ng=
k8s.io/component-helpers v0.0.0-20231020235215-606f6e27cff2/go.mod h1:8JUXbCGjLd/0eB5/RWXOTZkqb86webkxQM55LwVlWvg=
k8s.io/api v0.0.0-20231026091235-25009ae79765 h1:GeTq58G5OA+VmKehAk3LP7dA2l4RsRaQe8vUMXDvTHU=
k8s.io/api v0.0.0-20231026091235-25009ae79765/go.mod h1:i4rz1oPqY/CsIafru9jKN6/NKg0dGQ9YrrtoVOjTuCA=
k8s.io/apimachinery v0.0.0-20231026091025-0785eb2fbd30 h1:Hon5C9jsGyrJeF9bX+mlrSmHdQS8Klu18/bEP9G8ykc=
k8s.io/apimachinery v0.0.0-20231026091025-0785eb2fbd30/go.mod h1:n/gQXsAvdUdk5K3FFHr4/0B5Ivl2RFc2apd7BM8Vk+c=
k8s.io/cli-runtime v0.0.0-20231026093925-b52809d51a06 h1:XQYjkZ+NpAAxmw/tY34zkP4T1g/uRT5+AHinTuZDCrE=
k8s.io/cli-runtime v0.0.0-20231026093925-b52809d51a06/go.mod h1:xmGZBERQIj02cNkVRfjy+GctoKuAsvlhY/qMZ7Y0jrw=
k8s.io/client-go v0.0.0-20231026091529-4028f5ba6e18 h1:cl3ldpJMeAGg9+wiiJH04lEBrcqP7PGv9f8BrEYko3k=
k8s.io/client-go v0.0.0-20231026091529-4028f5ba6e18/go.mod h1:rQviUFL/2sj6LC5Co6m5xXsOgy5HOI4y+mF1xBO4h+8=
k8s.io/component-base v0.0.0-20231026092130-42e32587411a h1:BOv54SBgT9cohYVmsDwF94wBkLM+zi+Ysj0i3olLDq0=
k8s.io/component-base v0.0.0-20231026092130-42e32587411a/go.mod h1:TEzAj1x0GqP5Jfdxh8aq3930RJI59WrghyAnzH4CHjI=
k8s.io/component-helpers v0.0.0-20231026092244-9d021fe8f7bd h1:RdApGmkilCyaURb0Hs8/77J7oqw1HelqzMKh3GOgRso=
k8s.io/component-helpers v0.0.0-20231026092244-9d021fe8f7bd/go.mod h1:OOy0TP7Wd0srlOludqZgx9UFRbLpsS+iSwaFwScQoxk=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
k8s.io/metrics v0.0.0-20231021010548-6bb8d4fc3e8e h1:Z/InE9qlmAtaPxRpucsuep1fg9ayR0hOtQ9lbGij0t0=
k8s.io/metrics v0.0.0-20231021010548-6bb8d4fc3e8e/go.mod h1:vwizJPjMFBwUuGvHQ6aUUaH07ITQ7Q7cQ/FqcakZtI8=
k8s.io/metrics v0.0.0-20231026093805-3bb5742de9b7 h1:56aLba+ePoIoTs+7JsUnkLWEsYr66z+MWzyivhC/6mw=
k8s.io/metrics v0.0.0-20231026093805-3bb5742de9b7/go.mod h1:9Av9QvKf75Gt/xFdXc8XikdXwpEvY3zcdCKuYQ5nd/M=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=