Merge pull request #116143 from dashpole/otelhttp_26
cherry pick of #116140: update otelhttp to v0.35.1 Kubernetes-commit: a1ae9266f47a4447cb054142a18efecfbb56c0f6
This commit is contained in:
commit
343382c5c5
14
go.mod
14
go.mod
|
|
@ -6,8 +6,8 @@ go 1.19
|
|||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3
|
||||
k8s.io/cloud-provider v0.0.0-20230907080458-45231b7b01a5
|
||||
k8s.io/controller-manager v0.0.0-20230907080042-6766b27478a4
|
||||
k8s.io/cloud-provider v0.0.0-20230908005006-a5b00cde736d
|
||||
k8s.io/controller-manager v0.0.0-20230908004434-fe9a74cd05d9
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -21,7 +21,7 @@ require (
|
|||
golang.org/x/text v0.8.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-20230612180025-05b26fd95bb7 // indirect
|
||||
k8s.io/component-base v0.0.0-20230907225858-e3c41d530bb1 // indirect
|
||||
k8s.io/klog/v2 v2.80.1 // indirect
|
||||
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
|
||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
||||
|
|
@ -31,11 +31,11 @@ require (
|
|||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20230828183613-44c5cc8efdcb
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230907070223-7d53e6b52347
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230907232256-9c96642a2965
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20230828115542-7eeeef0f1637
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230907080458-45231b7b01a5
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230908005006-a5b00cde736d
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20230907225858-e3c41d530bb1
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230612180422-ce366bbf24d3
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230907080042-6766b27478a4
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230908004434-fe9a74cd05d9
|
||||
k8s.io/kms => k8s.io/kms v0.0.0-20230612180632-cff6428bab5b
|
||||
)
|
||||
|
|
|
|||
12
go.sum
12
go.sum
|
|
@ -69,12 +69,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|||
k8s.io/api v0.0.0-20230828183613-44c5cc8efdcb h1:8J+haFKWfAAClWIGWtwj8Wk3g2byiKZ4Ei0ZcwEnyek=
|
||||
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3 h1:knrxsqbI6uPqvwifZYRBmPwJE75MqMa6ejj1JqoldqQ=
|
||||
k8s.io/apimachinery v0.0.0-20230716202306-dd46389197a3/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
|
||||
k8s.io/cloud-provider v0.0.0-20230907080458-45231b7b01a5 h1:Dpc2sGG5b85fU99G2NRsZF3si3ejYxrqhXdqBTwRR/s=
|
||||
k8s.io/cloud-provider v0.0.0-20230907080458-45231b7b01a5/go.mod h1:uv174Jv1Hfws014bzUZ4F5j7Yy597sHi6Fr27MsJ1T0=
|
||||
k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7 h1:gZmkr019SCenIN2lXfb06fuLN7lQTzayNU6/5uXJTho=
|
||||
k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7/go.mod h1:IRHE6mCWqRgwL4fGUy/G327NhEdnyskNGvtw0fO6An0=
|
||||
k8s.io/controller-manager v0.0.0-20230907080042-6766b27478a4 h1:fM7b6IxM0L0z0Xo1qkvwouWee+hC1m724v3Ua7jvXls=
|
||||
k8s.io/controller-manager v0.0.0-20230907080042-6766b27478a4/go.mod h1:wFpNE6RtWQ/Jf0AWtNCE8+bxSEXPpUSP+3wS3MXuizQ=
|
||||
k8s.io/cloud-provider v0.0.0-20230908005006-a5b00cde736d h1:avkK3x6MDQfkF2grMcnQSHZLYfajoQhsZ/nBz9Lp43M=
|
||||
k8s.io/cloud-provider v0.0.0-20230908005006-a5b00cde736d/go.mod h1:f8wQXQFEOd8bcKEuODYAVWmzKhtn+zvVacDB48TjIyg=
|
||||
k8s.io/component-base v0.0.0-20230907225858-e3c41d530bb1 h1:w+dVHDK66kayWHwbMp037purZdAAxzqCFnSkT/WzdSc=
|
||||
k8s.io/component-base v0.0.0-20230907225858-e3c41d530bb1/go.mod h1:3YjEMj/PrbDO8sYuwM8KeIh37JUwlYjclrfiHcGbf2A=
|
||||
k8s.io/controller-manager v0.0.0-20230908004434-fe9a74cd05d9 h1:HmXc/P7A2NRpLOnqosMu4KPq7ooBG7JVlOILd2cN+Gs=
|
||||
k8s.io/controller-manager v0.0.0-20230908004434-fe9a74cd05d9/go.mod h1:MG20u3EHbgrbPiD/6F0vEnqOOH6UhxoyuBZdkdG4NPM=
|
||||
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-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
|
||||
|
|
|
|||
Loading…
Reference in New Issue