From 2bd34d193bacaec5c976bef54bbc1f80939b81ec 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 | 6 +++--- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2f5f44175..cd65ee973 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -344,11 +344,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "4f7a4f90b2c0" + "Rev": "eac758366a00" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "83fef8059749" + "Rev": "ec87dd743e08" }, { "ImportPath": "k8s.io/gengo", @@ -356,7 +356,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 59b58c2de..2890638b2 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20190923155552-eac758366a00 + k8s.io/apimachinery v0.0.0-20190923155427-ec87dd743e08 k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/yaml v1.1.0 @@ -41,7 +41,6 @@ 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/api => k8s.io/api v0.0.0-20190923155552-eac758366a00 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190923155427-ec87dd743e08 ) diff --git a/go.sum b/go.sum index d780fa0e0..92c49e698 100644 --- a/go.sum +++ b/go.sum @@ -177,6 +177,8 @@ 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/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=