From e8ecf509c6b3211bfe6a109a641a226a4de05857 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 23 Sep 2019 08:03:38 -0700 Subject: [PATCH] Merge pull request #83014 from danielqsj/bump-klog Bump k8s.io/klog to v1.0.0 Kubernetes-commit: b7003211d5454982401c19705f73bf2820ede855 --- Godeps/Godeps.json | 10 +++++----- go.mod | 13 ++++++------- go.sum | 4 ++++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index fa012bf..56e73ed 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -372,19 +372,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "7364b6bdad65" + "Rev": "eac758366a00" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "461753078381" + "Rev": "ec87dd743e08" }, { "ImportPath": "k8s.io/client-go", - "Rev": "3fe2abece89e" + "Rev": "2bd34d193bac" }, { "ImportPath": "k8s.io/component-base", - "Rev": "37a093468564" + "Rev": "c897bbc27d33" }, { "ImportPath": "k8s.io/gengo", @@ -392,7 +392,7 @@ }, { "ImportPath": "k8s.io/klog", - "Rev": "v0.4.0" + "Rev": "v1.0.0" }, { "ImportPath": "k8s.io/kube-openapi", diff --git a/go.mod b/go.mod index 07e4431..95babfe 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager go 1.12 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/apimachinery v0.0.0-20190923155427-ec87dd743e08 + k8s.io/component-base v0.0.0-20190923160219-c897bbc27d33 ) replace ( @@ -17,9 +17,8 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20190923155552-eac758366a00 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190923155427-ec87dd743e08 + k8s.io/client-go => k8s.io/client-go v0.0.0-20190923155754-2bd34d193bac + k8s.io/component-base => k8s.io/component-base v0.0.0-20190923160219-c897bbc27d33 ) diff --git a/go.sum b/go.sum index dd6d88c..5860f13 100644 --- a/go.sum +++ b/go.sum @@ -149,6 +149,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20190923155552-eac758366a00/go.mod h1:blPYY5r6fKug8SVOnjDtFAlzZzInCRL9NNls66SFhFI= +k8s.io/apimachinery v0.0.0-20190923155427-ec87dd743e08/go.mod h1:grJJH0hgilA2pYoUiJcPu2EDUal95NTq1vpxxvMLSu8= +k8s.io/client-go v0.0.0-20190923155754-2bd34d193bac/go.mod h1:D/1Tps6X8s8BMlqc5uhTjIUymrZ9AJqNc4nUpFrcf20= +k8s.io/component-base v0.0.0-20190923160219-c897bbc27d33/go.mod h1:Orff3QB/+w5/gd9KP288vP9aeE3aBbXmaH8HLSlSqHY= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=