Merge pull request #2843 from cynepco3hahue/move_glog_to_staging

Move glog package from pkg/staging to staging/src/github.com/golang

cmd/virt-handler/BUILD.bazel

@@ -24,6 +24,7 @@ go_library(
         "//pkg/virt-handler/selinux:go_default_library",
         "//pkg/virt-launcher:go_default_library",
         "//pkg/virt-launcher/virtwrap/api:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/api/v1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
@@ -41,7 +42,6 @@ go_library(
         "//vendor/k8s.io/client-go/tools/record:go_default_library",
         "//vendor/k8s.io/client-go/util/cert:go_default_library",
         "//vendor/k8s.io/client-go/util/certificate:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )
 

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-kit/kit v0.8.0
+	github.com/go-kit/kit v0.9.0
 	github.com/go-openapi/errors v0.19.2
 	github.com/go-openapi/runtime v0.17.2 // indirect
 	github.com/go-openapi/spec v0.19.2
@@ -83,6 +83,7 @@ replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.0.0+incompatible
 	github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.0.0-20181206002233-dd6f23e7207c
 	github.com/go-kit/kit => github.com/go-kit/kit v0.3.0
+	github.com/golang/glog => ./staging/src/github.com/golang/glog
 	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
 	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236

go.sum

@@ -164,8 +164,6 @@ github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20180924190550-6f2cf27854a4/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
@@ -268,7 +266,7 @@ github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/maxbrunsfeld/counterfeiter v0.0.0-20181017030959-1aadac120687/go.mod h1:aoVsckWnsNzazwF2kmD+bzgdr4GBlbK91zsdivQJ2eU=
-github.com/mfranczy/crd-rest-coverage v0.1.0 h1:GPjgv3oQ2zVy2JbZmmLV6/lfyFTu3AEmpegAqOlFj7U=
+github.com/mfranczy/crd-rest-coverage v0.1.0 h1:235kOdqFQ6Io+hsI/SvHfoYDHkSNEmb7cu6TG24O93Y=
 github.com/mfranczy/crd-rest-coverage v0.1.0/go.mod h1:yRun7BqJIqQC+myEhfhMvbImzQ5IOE4tAlln5KDIfqQ=
 github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b h1:9+ke9YJ9KGWw5ANXK6ozjoK47uI3uNbXv4YVINBnGm8=
 github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk=

hack/dep-prune.sh

@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
 
-rm -rf vendor/github.com/golang/glog
-mkdir -p vendor/github.com/golang/
-ln -s ../../../pkg/staging/glog/ vendor/github.com/golang/glog
+set -ex
+
+source hack/common.sh
+
+# create symbolic link on glog package to avoid duplication
+rm -rf ${KUBEVIRT_DIR}/vendor/github.com/golang/glog
+mkdir -p ${KUBEVIRT_DIR}/vendor/github.com/golang
+ln -s ../../../staging/src/github.com/golang/glog/ ${KUBEVIRT_DIR}/vendor/github.com/golang/glog
 
 # create symbolic link on client-go package to avoid duplication
-rm -rf vendor/kubevirt.io/client-go
-mkdir -p vendor/kubevirt.io
-ln -s ../../staging/src/kubevirt.io/client-go/ vendor/kubevirt.io/client-go
+rm -rf ${KUBEVIRT_DIR}/vendor/kubevirt.io/client-go
+mkdir -p ${KUBEVIRT_DIR}/vendor/kubevirt.io
+ln -s ../../staging/src/kubevirt.io/client-go/ ${KUBEVIRT_DIR}/vendor/kubevirt.io/client-go

hack/dep-update.sh

@@ -9,5 +9,10 @@ export GO111MODULE=on
     go mod tidy
 )
 
+(
+    cd staging/src/github.com/golang/glog
+    go mod tidy
+)
+
 go mod tidy
 go mod vendor

pkg/controller/BUILD.bazel

@@ -14,6 +14,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/testutils:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/api/v1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
@@ -45,7 +46,6 @@ go_library(
         "//vendor/k8s.io/client-go/util/workqueue:go_default_library",
         "//vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1:go_default_library",
         "//vendor/kubevirt.io/containerized-data-importer/pkg/client/informers/externalversions:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )
 

pkg/util/openapi/BUILD.bazel

@@ -6,13 +6,13 @@ go_library(
     importpath = "kubevirt.io/kubevirt/pkg/util/openapi",
     visibility = ["//visibility:public"],
     deps = [
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
         "//vendor/github.com/emicklei/go-restful-openapi:go_default_library",
         "//vendor/github.com/go-openapi/errors:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
         "//vendor/github.com/go-openapi/strfmt:go_default_library",
         "//vendor/github.com/go-openapi/validate:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )

pkg/virt-api/webhooks/BUILD.bazel

@@ -12,6 +12,7 @@ go_library(
         "//pkg/controller:go_default_library",
         "//pkg/util/openapi:go_default_library",
         "//pkg/virt-api/rest:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/api/v1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
@@ -21,6 +22,5 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )

pkg/virt-controller/watch/BUILD.bazel

@@ -26,6 +26,7 @@ go_library(
         "//pkg/virt-controller/services:go_default_library",
         "//pkg/virt-controller/watch/drain/disruptionbudget:go_default_library",
         "//pkg/virt-controller/watch/drain/evacuation:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/api/v1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
@@ -52,7 +53,6 @@ go_library(
         "//vendor/k8s.io/client-go/util/workqueue:go_default_library",
         "//vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1:go_default_library",
         "//vendor/kubevirt.io/containerized-data-importer/pkg/clone:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )
 

pkg/virt-operator/install-strategy/BUILD.bazel

@@ -15,6 +15,7 @@ go_library(
         "//pkg/virt-operator/creation/components:go_default_library",
         "//pkg/virt-operator/creation/rbac:go_default_library",
         "//pkg/virt-operator/util:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/api/v1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
@@ -33,7 +34,6 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/client-go/util/cert:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )
 

pkg/virtctl/vnc/BUILD.bazel

@@ -7,9 +7,9 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/virtctl/templates:go_default_library",
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )

staging/src/github.com/BUILD.bazel

@@ -0,0 +1 @@
+# gazelle:prefix github.com

pkg/staging/glog/BUILD.bazel → staging/src/github.com/golang/glog/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["glog.go"],
-    importpath = "kubevirt.io/kubevirt/pkg/staging/glog",
+    importpath = "github.com/golang/glog",
     visibility = ["//visibility:public"],
     deps = ["//vendor/github.com/go-kit/kit/log:go_default_library"],
 )

staging/src/github.com/golang/glog/go.mod

@@ -0,0 +1,9 @@
+module github.com/golang/glog
+
+go 1.12
+
+require (
+	github.com/go-kit/kit v0.9.0
+	github.com/go-logfmt/logfmt v0.4.0 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+)

staging/src/github.com/golang/glog/go.sum

@@ -0,0 +1,8 @@
+github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=

staging/src/kubevirt.io/client-go/log/BUILD.bazel

@@ -6,13 +6,13 @@ go_library(
     importpath = "kubevirt.io/client-go/log",
     visibility = ["//visibility:public"],
     deps = [
+        "//staging/src/github.com/golang/glog:go_default_library",
         "//vendor/github.com/go-kit/kit/log:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
     ],
 )
 

vendor/modules.txt

@@ -54,7 +54,7 @@ github.com/ghodss/yaml
 # github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
 github.com/globalsign/mgo/bson
 github.com/globalsign/mgo/internal/json
-# github.com/go-kit/kit v0.8.0 => github.com/go-kit/kit v0.3.0
+# github.com/go-kit/kit v0.9.0 => github.com/go-kit/kit v0.3.0
 github.com/go-kit/kit/endpoint
 github.com/go-kit/kit/log
 github.com/go-kit/kit/transport/http
@@ -95,7 +95,7 @@ github.com/gogo/protobuf/gogoproto
 github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/sortkeys
 github.com/gogo/protobuf/protoc-gen-gogo/descriptor
-# github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+# github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b => ./staging/src/github.com/golang/glog
 github.com/golang/glog
 # github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef
 github.com/golang/groupcache/lru