Merge pull request #119312 from pacoxu/prometheus/common-v0.44

upgrade prometheus common to v0.44.0

Kubernetes-commit: d627c4b41cdd9ef08b13604ce1c460eca26684f8
This commit is contained in:
Kubernetes Publisher 2023-07-17 15:53:33 -07:00
commit 21bb5a7b9d
2 changed files with 35 additions and 36 deletions

32
go.mod
View File

@ -9,12 +9,12 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.2
google.golang.org/grpc v1.54.0
k8s.io/api v0.0.0-20230715091319-27865287bbf9
k8s.io/apimachinery v0.0.0-20230714211010-7924d2c22746
k8s.io/apiserver v0.0.0-20230715013359-04b26c4697c8
k8s.io/client-go v0.0.0-20230715091853-162ee91898bd
k8s.io/component-base v0.0.0-20230716171541-5abd0dd418a6
k8s.io/cri-api v0.0.0-20230714220223-c71b9ac540a8
k8s.io/api v0.0.0-20230718014949-277ce0d086e7
k8s.io/apimachinery v0.0.0-20230718014249-03c97687112f
k8s.io/apiserver v0.0.0-20230718022008-90b43d678411
k8s.io/client-go v0.0.0-20230718015924-efe741a289f1
k8s.io/component-base v0.0.0-20230718021152-590f17cba088
k8s.io/cri-api v0.0.0-20230718023847-0950fc7cea27
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)
@ -36,13 +36,13 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
@ -59,11 +59,11 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230715091319-27865287bbf9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230714211010-7924d2c22746
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230715013359-04b26c4697c8
k8s.io/client-go => k8s.io/client-go v0.0.0-20230715091853-162ee91898bd
k8s.io/component-base => k8s.io/component-base v0.0.0-20230716171541-5abd0dd418a6
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20230714220223-c71b9ac540a8
k8s.io/kms => k8s.io/kms v0.0.0-20230714213935-c711bc7a66b5
k8s.io/api => k8s.io/api v0.0.0-20230718014949-277ce0d086e7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230718014249-03c97687112f
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230718022008-90b43d678411
k8s.io/client-go => k8s.io/client-go v0.0.0-20230718015924-efe741a289f1
k8s.io/component-base => k8s.io/component-base v0.0.0-20230718021152-590f17cba088
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20230718023847-0950fc7cea27
k8s.io/kms => k8s.io/kms v0.0.0-20230718021458-ae70d707985d
)

39
go.sum
View File

@ -22,7 +22,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@ -61,13 +60,13 @@ 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_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
@ -95,8 +94,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
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/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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=
@ -144,18 +143,18 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20230715091319-27865287bbf9 h1:oQDNS9esWgkSCTdX+0K4T1mEeTLVKcJXKpFVY/vJAY4=
k8s.io/api v0.0.0-20230715091319-27865287bbf9/go.mod h1:nHelHGU5nRmkT223Jbg1sZZjj9DvhsKLsEekrET50A4=
k8s.io/apimachinery v0.0.0-20230714211010-7924d2c22746 h1:ZRR1OH9l7t2q4sW0wB74g7ZDDSAWvAuO/jAcSHt7FVk=
k8s.io/apimachinery v0.0.0-20230714211010-7924d2c22746/go.mod h1:82hjKsW08vcDFh8wS9BtEee9UTcm0IlvyBnJ/zawF6E=
k8s.io/apiserver v0.0.0-20230715013359-04b26c4697c8 h1:+zzWy06P1IpbSO7SD1j04uy51Zt8pSL+QGx1BVlPE2Y=
k8s.io/apiserver v0.0.0-20230715013359-04b26c4697c8/go.mod h1:4DU0PFV2qGncnstK4IIJTb1PF5tSsg/u0LgFSPLJluM=
k8s.io/client-go v0.0.0-20230715091853-162ee91898bd h1:YqSMpMT16Vrguc2g5Ky4C4WbLNpSgw71JjXpswQzhbU=
k8s.io/client-go v0.0.0-20230715091853-162ee91898bd/go.mod h1:HucWozGd57Fi5IdRJJ2lBaCCnECsyXlY642nrIdS7M0=
k8s.io/component-base v0.0.0-20230716171541-5abd0dd418a6 h1:eW/34wfskO8c3dUAetR/3Fg99F1lfASTFIf/SJD0eB0=
k8s.io/component-base v0.0.0-20230716171541-5abd0dd418a6/go.mod h1:BDyOgf+3drah5MUEtRMmwGzCrxqmdcQlfXsFkrRwHuk=
k8s.io/cri-api v0.0.0-20230714220223-c71b9ac540a8 h1:6autGglHFgzQSyQyevKKklnzbc2sXdBkw9pPoY1dWXY=
k8s.io/cri-api v0.0.0-20230714220223-c71b9ac540a8/go.mod h1:w4Wvfsep81rv9/oBkLfzK+4nEMHZNgGZyKD9WIr1Qn4=
k8s.io/api v0.0.0-20230718014949-277ce0d086e7 h1:OWynHOnTzwj08ZEICnHlEbLI8xSs7Tmt5pguevblEck=
k8s.io/api v0.0.0-20230718014949-277ce0d086e7/go.mod h1:zxLOnGEFihnzaAvaWmy+DW4UbCIWFMfI3tRG5S9XEjE=
k8s.io/apimachinery v0.0.0-20230718014249-03c97687112f h1:asn3+fc9pfDX01Yfu83LeWkfdxFvwSQlHBVrsHnw6r4=
k8s.io/apimachinery v0.0.0-20230718014249-03c97687112f/go.mod h1:qGEW5CgfSiVy8AuAsSu5e5Se+9ZsnXBlbrIjeCn1/Dw=
k8s.io/apiserver v0.0.0-20230718022008-90b43d678411 h1:F4djzHsMzBeL0lQzJVpnT5fYgk0Tu7P/7ONmqdaUBAI=
k8s.io/apiserver v0.0.0-20230718022008-90b43d678411/go.mod h1:h801cappsPyM38bFytdrvJhfRde7END551AODhd5v58=
k8s.io/client-go v0.0.0-20230718015924-efe741a289f1 h1:B3ah2Vuyt8ym0sso6up7voNMlOe9IT6cU9h7BIS8rsY=
k8s.io/client-go v0.0.0-20230718015924-efe741a289f1/go.mod h1:Gaq2IIlHLhO9wlYVCPAGW/G1DzwffXQiyEoLZmjDGXQ=
k8s.io/component-base v0.0.0-20230718021152-590f17cba088 h1:ExsQpTlZQ2xD1uGqgYQKlxBa7sEvSthTpY5XFbsAvj0=
k8s.io/component-base v0.0.0-20230718021152-590f17cba088/go.mod h1:VMxp2yP5XBuQOMBQ9AWFwqZWDb7EY1ayv0spuSioYuQ=
k8s.io/cri-api v0.0.0-20230718023847-0950fc7cea27 h1:pPHqRi4YubRFTWHYHgAH0UmcGdZdo/DXTbvI3+aZ89o=
k8s.io/cri-api v0.0.0-20230718023847-0950fc7cea27/go.mod h1:PgM+VelU7VKINUeaNLdE4fElKXfORIfTRNRM5wFBRCw=
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-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=