Skip to content

Commit b094dd9

Browse files
authored
Merge pull request kubernetes#78465 from yuwenma/bump-klog
Bump klog to v0.3.2
2 parents 46a3d82 + 5cef374 commit b094dd9

File tree

39 files changed

+178
-117
lines changed

39 files changed

+178
-117
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ require (
178178
k8s.io/csi-translation-lib v0.0.0
179179
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
180180
k8s.io/heapster v1.2.0-beta.1
181-
k8s.io/klog v0.3.1
181+
k8s.io/klog v0.3.2
182182
k8s.io/kube-aggregator v0.0.0
183183
k8s.io/kube-controller-manager v0.0.0
184184
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
@@ -442,7 +442,7 @@ replace (
442442
k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib
443443
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
444444
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
445-
k8s.io/klog => k8s.io/klog v0.3.1
445+
k8s.io/klog => k8s.io/klog v0.3.2
446446
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
447447
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
448448
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8
462462
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
463463
k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
464464
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
465-
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
466-
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
465+
k8s.io/klog v0.3.2 h1:qvP/U6CcZ6qyi/qSHlJKdlAboCzo3mT0DAm0XAarpz4=
466+
k8s.io/klog v0.3.2/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
467467
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
468468
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
469469
k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 h1:WD6cPA3q7qxZe6Fwir0XjjGwGMaWbHlHUcjCcOzuRG0=

staging/src/k8s.io/api/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/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
k8s.io/client-go v0.0.0
3333
k8s.io/code-generator v0.0.0
3434
k8s.io/component-base v0.0.0
35-
k8s.io/klog v0.3.1
35+
k8s.io/klog v0.3.2
3636
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
3737
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
3838
sigs.k8s.io/yaml v1.1.0

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/apimachinery/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
3232
gopkg.in/inf.v0 v0.9.0
3333
gopkg.in/yaml.v2 v2.2.1
34-
k8s.io/klog v0.3.1
34+
k8s.io/klog v0.3.2
3535
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
3636
sigs.k8s.io/yaml v1.1.0
3737
)

staging/src/k8s.io/apimachinery/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/apimachinery/pkg/util/runtime/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ go_test(
1010
name = "go_default_test",
1111
srcs = ["runtime_test.go"],
1212
embed = [":go_default_library"],
13+
deps = ["//vendor/k8s.io/klog:go_default_library"],
1314
)
1415

1516
go_library(

staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,15 @@ import (
2424
"regexp"
2525
"strings"
2626
"testing"
27+
28+
"k8s.io/klog"
2729
)
2830

31+
func TestMain(m *testing.M) {
32+
klog.InitFlags(nil)
33+
os.Exit(m.Run())
34+
}
35+
2936
func TestHandleCrash(t *testing.T) {
3037
defer func() {
3138
if x := recover(); x == nil {
@@ -96,7 +103,7 @@ func TestHandleCrashLog(t *testing.T) {
96103
// .../src/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:69 +0x...
97104
lines := strings.Split(log, "\n")
98105
if len(lines) < 4 {
99-
t.Fatalf("panic log should have 1 line of message, 1 line per goroutine and 2 lines per function call")
106+
t.Fatalf("panic log should have 1 line of message, 1 line per goroutine and 2 lines per function call: %v", lines)
100107
}
101108
if match, _ := regexp.MatchString("Observed a panic: test panic", lines[0]); !match {
102109
t.Errorf("mismatch panic message: %s", lines[0])

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ require (
6161
k8s.io/apimachinery v0.0.0
6262
k8s.io/client-go v0.0.0
6363
k8s.io/component-base v0.0.0
64-
k8s.io/klog v0.3.1
64+
k8s.io/klog v0.3.2
6565
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
6666
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
6767
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2

0 commit comments

Comments
 (0)