From 49c5602c402639b63d6c46c486fd526d3d21ac0f Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 9 Nov 2018 13:49:10 -0500 Subject: [PATCH 1/2] Move from glog to klog - Move from the old github.com/golang/glog to k8s.io/klog - klog as explicit InitFlags() so we add them as necessary - we update the other repositories that we vendor that made a similar change from glog to klog * github.com/kubernetes/repo-infra * k8s.io/gengo/ * k8s.io/kube-openapi/ * github.com/google/cadvisor - Entirely remove all references to glog - Fix some tests by explicit InitFlags in their init() methods Change-Id: I92db545ff36fcec83afe98f550c9e630098b3135 Kubernetes-commit: 954996e231074dc7429f7be1256a579bedd8344c --- Godeps/Godeps.json | 56 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 8d52093..3cd9577 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/kube-controller-manager", "GoVersion": "go1.11", - "GodepVersion": "v80", + "GodepVersion": "v80-k8s-r1", "Packages": [ "./..." ], @@ -14,10 +14,6 @@ "ImportPath": "github.com/gogo/protobuf/sortkeys", "Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02" }, - { - "ImportPath": "github.com/golang/glog", - "Rev": "44145f04b68cf362d9c4df2182967c2275eaefed" - }, { "ImportPath": "github.com/google/gofuzz", "Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c" @@ -60,103 +56,103 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/config", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/naming", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "261df694e7250e4fa7eb0d5ccff0e4b657a77953" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/config", - "Rev": "92634e4423af1b6ad84ab94b43948b0e504a3edd" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1", - "Rev": "92634e4423af1b6ad84ab94b43948b0e504a3edd" + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { "ImportPath": "k8s.io/utils/pointer", From c5eb6b7106622051719a636aa8e450e1ac85c2bd Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 9 Nov 2018 16:41:26 -0500 Subject: [PATCH 2/2] Update all the staging Godeps.json Change-Id: I64b30c68a606b4f5c095a66496a1e48c4d62ea88 Kubernetes-commit: 68ce375d0039738df5a2a837122215f3224f1fde --- Godeps/Godeps.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 3cd9577..8927874 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -154,6 +154,10 @@ "ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/klog", + "Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f" + }, { "ImportPath": "k8s.io/utils/pointer", "Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed"