Skip to content

Commit b700321

Browse files
authored
Merge pull request kubernetes#83014 from danielqsj/bump-klog
Bump k8s.io/klog to v1.0.0
2 parents 4387505 + c2a4906 commit b700321

File tree

44 files changed

+84
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+84
-88
lines changed

cluster/addons/fluentd-elasticsearch/es-image/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
2929
k8s.io/apiserver v0.0.0-20190111033246-d50e9ac5404f // indirect
3030
k8s.io/client-go v10.0.0+incompatible
31-
k8s.io/klog v0.1.0
31+
k8s.io/klog v1.0.0
3232
k8s.io/kubernetes v1.13.2
3333
k8s.io/utils v0.0.0-20181221173059-8a16e7dd8fb6 // indirect
3434
sigs.k8s.io/yaml v1.1.0 // indirect

cluster/addons/fluentd-elasticsearch/es-image/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
66
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
7+
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
78
github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
89
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
910
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
@@ -71,6 +72,7 @@ k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUr
7172
k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
7273
k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk=
7374
k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
75+
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
7476
k8s.io/kubernetes v1.13.2 h1:rBz6dubDY4bfv85G6zo04v9G5wniTxvBI9yQ/QxJS3g=
7577
k8s.io/kubernetes v1.13.2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
7678
k8s.io/utils v0.0.0-20181221173059-8a16e7dd8fb6 h1:+jRzzMyx+I9J18BvwHYmZ5hpPwoZfh6g39WfNlsMCkY=

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ require (
155155
k8s.io/csi-translation-lib v0.0.0
156156
k8s.io/gengo v0.0.0-20190822140433-26a664648505
157157
k8s.io/heapster v1.2.0-beta.1
158-
k8s.io/klog v0.4.0
158+
k8s.io/klog v1.0.0
159159
k8s.io/kube-aggregator v0.0.0
160160
k8s.io/kube-controller-manager v0.0.0
161161
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
@@ -458,7 +458,7 @@ replace (
458458
k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib
459459
k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
460460
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
461-
k8s.io/klog => k8s.io/klog v0.4.0
461+
k8s.io/klog => k8s.io/klog v1.0.0
462462
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
463463
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
464464
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKO
500500
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
501501
k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
502502
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
503-
k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
504-
k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
503+
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
504+
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
505505
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
506506
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
507507
k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 h1:WD6cPA3q7qxZe6Fwir0XjjGwGMaWbHlHUcjCcOzuRG0=

pkg/kubelet/pluginmanager/operationexecutor/operation_generator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ package operationexecutor
2323
import (
2424
"context"
2525
"fmt"
26-
"k8s.io/klog"
2726
"net"
2827
"time"
2928

29+
"k8s.io/klog"
30+
3031
"github.com/pkg/errors"
3132
"google.golang.org/grpc"
3233
"k8s.io/client-go/tools/record"

pkg/proxy/ipvs/ipset.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import (
2222
utilipset "k8s.io/kubernetes/pkg/util/ipset"
2323

2424
"fmt"
25-
"k8s.io/klog"
2625
"strings"
26+
27+
"k8s.io/klog"
2728
)
2829

2930
const (

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
@@ -28,7 +28,7 @@ require (
2828
k8s.io/client-go v0.0.0
2929
k8s.io/code-generator v0.0.0
3030
k8s.io/component-base v0.0.0
31-
k8s.io/klog v0.4.0
31+
k8s.io/klog v1.0.0
3232
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
3333
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
3434
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
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
3232
gopkg.in/inf.v0 v0.9.0
3333
gopkg.in/yaml.v2 v2.2.2
34-
k8s.io/klog v0.4.0
34+
k8s.io/klog v1.0.0
3535
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
3636
sigs.k8s.io/yaml v1.1.0
3737
)

0 commit comments

Comments
 (0)