Skip to content

Commit a7e4973

Browse files
authored
Merge pull request kubernetes#91634 from jpbetz/latest-utils
Bump k8s.io/utils to 6e3d28 to pick up nested trace
2 parents 819ad44 + 52838be commit a7e4973

File tree

35 files changed

+314
-108
lines changed

35 files changed

+314
-108
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ require (
139139
k8s.io/metrics v0.0.0
140140
k8s.io/sample-apiserver v0.0.0
141141
k8s.io/system-validators v1.1.2
142-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
142+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
143143
sigs.k8s.io/kustomize v2.0.3+incompatible
144144
sigs.k8s.io/yaml v1.2.0
145145
)
@@ -488,7 +488,7 @@ replace (
488488
k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin
489489
k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller
490490
k8s.io/system-validators => k8s.io/system-validators v1.1.2
491-
k8s.io/utils => k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
491+
k8s.io/utils => k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
492492
modernc.org/cc => modernc.org/cc v1.0.0
493493
modernc.org/golex => modernc.org/golex v1.0.0
494494
modernc.org/mathutil => modernc.org/mathutil v1.0.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 h1:5NC2ITmvg8RoxoH0wgmL4z
554554
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9/go.mod h1:bfCVj+qXcEaE5SCvzBaqpOySr6tuCcpPKqF6HD8nyCw=
555555
k8s.io/system-validators v1.1.2 h1:0xzEb0PqnDnUOuf/2E/gaJBOBN7j+qf0LIn12jw3oc4=
556556
k8s.io/system-validators v1.1.2/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
557-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 h1:Ly1Oxdu5p5ZFmiVT71LFgeZETvMfZ1iBIGeOenT2JeM=
558-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
557+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 h1:7Nu2dTj82c6IaWvL7hImJzcXoTPz1MsSCH7r+0m6rfo=
558+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
559559
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
560560
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
561561
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
k8s.io/component-base v0.0.0
3030
k8s.io/klog/v2 v2.1.0
3131
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
32-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
32+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
3333
sigs.k8s.io/yaml v1.2.0
3434
)
3535

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
k8s.io/component-base v0.0.0
4949
k8s.io/klog/v2 v2.1.0
5050
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
51-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
51+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
5252
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9
5353
sigs.k8s.io/structured-merge-diff/v3 v3.0.0
5454
sigs.k8s.io/yaml v1.2.0

staging/src/k8s.io/apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/cli-runtime/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/client-go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
k8s.io/api v0.0.0
3030
k8s.io/apimachinery v0.0.0
3131
k8s.io/klog/v2 v2.1.0
32-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
32+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
3333
sigs.k8s.io/yaml v1.2.0
3434
)
3535

staging/src/k8s.io/client-go/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/cloud-provider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
k8s.io/client-go v0.0.0
1313
k8s.io/component-base v0.0.0
1414
k8s.io/klog/v2 v2.1.0
15-
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
15+
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
1616
)
1717

1818
replace (

0 commit comments

Comments
 (0)