Merge pull request #59842 from ixdy/update-rules_go-02-2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

 Update bazelbuild/rules_go, kubernetes/repo-infra, and gazelle dependencies

**What this PR does / why we need it**: updates our bazelbuild/rules_go dependency in order to bump everything to go1.9.4. I'm separating this effort into two separate PRs, since updating rules_go requires a large cleanup, removing an attribute from most build rules.

**Release note**:

```release-note
NONE
```

Kubernetes-commit: 96ec3187180b9c1d722756b3ea0984ebe65424dc

vendor/k8s.io/code-generator/cmd/client-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "client-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/client-gen",
 )
 
 go_library(
@@ -21,6 +20,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/client-gen/generators:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
     ],
 )

vendor/k8s.io/code-generator/cmd/client-gen/args/BUILD

@@ -39,7 +39,6 @@ go_test(
     name = "go_default_test",
     srcs = ["gvpackages_test.go"],
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/client-gen/args",
     deps = [
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library",

vendor/k8s.io/code-generator/cmd/client-gen/args/args.go

@@ -27,12 +27,7 @@ import (
 	codegenutil "k8s.io/code-generator/pkg/util"
 )
 
-var DefaultInputDirs = []string{
-	"k8s.io/apimachinery/pkg/fields",
-	"k8s.io/apimachinery/pkg/labels",
-	"k8s.io/apimachinery/pkg/watch",
-	"k8s.io/apimachinery/pkg/apimachinery/registered",
-}
+var DefaultInputDirs = []string{}
 
 // ClientGenArgs is a wrapper for arguments to client-gen.
 type CustomArgs struct {

vendor/k8s.io/code-generator/cmd/client-gen/generators/util/BUILD

@@ -10,7 +10,6 @@ go_test(
     name = "go_default_test",
     srcs = ["tags_test.go"],
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/client-gen/generators/util",
 )
 
 go_library(

vendor/k8s.io/code-generator/cmd/client-gen/main.go

@@ -27,6 +27,7 @@ import (
 
 	generatorargs "k8s.io/code-generator/cmd/client-gen/args"
 	"k8s.io/code-generator/cmd/client-gen/generators"
+	"k8s.io/code-generator/pkg/util"
 )
 
 func main() {
@@ -34,7 +35,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of client-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 	genericArgs.OutputPackagePath = "k8s.io/kubernetes/pkg/client/clientset_generated/"
 
 	genericArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/client-gen/types/BUILD

@@ -20,7 +20,6 @@ go_test(
     name = "go_default_test",
     srcs = ["helpers_test.go"],
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/client-gen/types",
 )
 
 filegroup(

vendor/k8s.io/code-generator/cmd/conversion-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "conversion-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/conversion-gen",
 )
 
 go_library(
@@ -21,6 +20,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/conversion-gen/args:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/conversion-gen/generators:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
     ],
 )

vendor/k8s.io/code-generator/cmd/conversion-gen/main.go

@@ -44,6 +44,7 @@ import (
 
 	generatorargs "k8s.io/code-generator/cmd/conversion-gen/args"
 	"k8s.io/code-generator/cmd/conversion-gen/generators"
+	"k8s.io/code-generator/pkg/util"
 )
 
 func main() {
@@ -51,7 +52,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of conversion-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 
 	genericArgs.AddFlags(pflag.CommandLine)
 	customArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/deepcopy-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "deepcopy-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/deepcopy-gen",
 )
 
 go_library(
@@ -20,6 +19,7 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/deepcopy-gen/args:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/examples/deepcopy-gen/generators:go_default_library",
     ],

vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go

@@ -52,6 +52,7 @@ import (
 	"k8s.io/gengo/examples/deepcopy-gen/generators"
 
 	generatorargs "k8s.io/code-generator/cmd/deepcopy-gen/args"
+	"k8s.io/code-generator/pkg/util"
 )
 
 func main() {
@@ -59,7 +60,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of deepcopy-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 
 	genericArgs.AddFlags(pflag.CommandLine)
 	customArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/defaulter-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "defaulter-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/defaulter-gen",
 )
 
 go_library(
@@ -20,6 +19,7 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/defaulter-gen/args:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/examples/defaulter-gen/generators:go_default_library",
     ],

vendor/k8s.io/code-generator/cmd/defaulter-gen/main.go

@@ -51,6 +51,7 @@ import (
 	"k8s.io/gengo/examples/defaulter-gen/generators"
 
 	generatorargs "k8s.io/code-generator/cmd/defaulter-gen/args"
+	"k8s.io/code-generator/pkg/util"
 )
 
 func main() {
@@ -58,7 +59,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of defaulter-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 
 	genericArgs.AddFlags(pflag.CommandLine)
 	customArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/go-to-protobuf/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "go-to-protobuf",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/go-to-protobuf",
 )
 
 go_library(

vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD

@@ -21,6 +21,7 @@ go_library(
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/code-generator/third_party/forked/golang/reflect:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
@@ -34,7 +35,6 @@ go_test(
     name = "go_default_test",
     srcs = ["namer_test.go"],
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protobuf",
 )
 
 filegroup(

vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go

@@ -27,6 +27,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"k8s.io/code-generator/pkg/util"
 	"k8s.io/gengo/args"
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
@@ -55,7 +56,7 @@ func New() *Generator {
 	sourceTree := args.DefaultSourceTree()
 	common := args.GeneratorArgs{
 		OutputBase:       sourceTree,
-		GoHeaderFilePath: filepath.Join(sourceTree, "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt"),
+		GoHeaderFilePath: filepath.Join(sourceTree, util.BoilerplatePath()),
 	}
 	defaultProtoImport := filepath.Join(sourceTree, "k8s.io", "kubernetes", "vendor", "github.com", "gogo", "protobuf", "protobuf")
 	cwd, err := os.Getwd()
@@ -74,6 +75,7 @@ func New() *Generator {
 			`+k8s.io/apimachinery/pkg/runtime`,
 			`k8s.io/apimachinery/pkg/apis/meta/v1`,
 			`k8s.io/apimachinery/pkg/apis/meta/v1beta1`,
+			`k8s.io/apimachinery/pkg/apis/testapigroup/v1`,
 		}, ","),
 		Packages:           "",
 		DropEmbeddedFields: "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta",

vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go

@@ -128,7 +128,7 @@ func isProtoable(seen map[*types.Type]bool, t *types.Type) bool {
 	case types.Interface:
 		return false
 	default:
-		log.Printf("WARNING: type %q is not protable: %s", t.Kind, t.Name)
+		log.Printf("WARNING: type %q is not portable: %s", t.Kind, t.Name)
 		return false
 	}
 }

vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "protoc-gen-gogo",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo",
 )
 
 go_library(

vendor/k8s.io/code-generator/cmd/import-boss/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "import-boss",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/import-boss",
 )
 
 go_library(
@@ -18,6 +17,7 @@ go_library(
     importpath = "k8s.io/code-generator/cmd/import-boss",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/examples/import-boss/generators:go_default_library",
     ],

vendor/k8s.io/code-generator/cmd/import-boss/main.go

@@ -59,6 +59,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"k8s.io/code-generator/pkg/util"
 	"k8s.io/gengo/args"
 	"k8s.io/gengo/examples/import-boss/generators"
 
@@ -69,7 +70,7 @@ func main() {
 	arguments := args.Default()
 
 	// Override defaults.
-	arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 	arguments.InputDirs = []string{
 		"k8s.io/kubernetes/pkg/...",
 		"k8s.io/kubernetes/cmd/...",

vendor/k8s.io/code-generator/cmd/informer-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "informer-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/informer-gen",
 )
 
 go_library(
@@ -21,6 +20,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/informer-gen/args:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/informer-gen/generators:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
     ],
 )

vendor/k8s.io/code-generator/cmd/informer-gen/main.go

@@ -23,6 +23,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
 	"k8s.io/code-generator/cmd/informer-gen/generators"
+	"k8s.io/code-generator/pkg/util"
 	"k8s.io/gengo/args"
 
 	generatorargs "k8s.io/code-generator/cmd/informer-gen/args"
@@ -33,7 +34,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move out of informer-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 	genericArgs.OutputPackagePath = "k8s.io/kubernetes/pkg/client/informers/informers_generated"
 	customArgs.VersionedClientSetPackage = "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	customArgs.InternalClientSetPackage = "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

vendor/k8s.io/code-generator/cmd/lister-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "lister-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/lister-gen",
 )
 
 go_library(
@@ -21,6 +20,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/lister-gen/args:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/lister-gen/generators:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
     ],
 )

vendor/k8s.io/code-generator/cmd/lister-gen/main.go

@@ -23,6 +23,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
 	"k8s.io/code-generator/cmd/lister-gen/generators"
+	"k8s.io/code-generator/pkg/util"
 	"k8s.io/gengo/args"
 
 	generatorargs "k8s.io/code-generator/cmd/lister-gen/args"
@@ -33,7 +34,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of lister-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 	genericArgs.OutputPackagePath = "k8s.io/kubernetes/pkg/client/listers"
 
 	genericArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/openapi-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "openapi-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/openapi-gen",
 )
 
 go_library(
@@ -20,6 +19,7 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/code-generator/cmd/openapi-gen/args:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/generators:go_default_library",
     ],

vendor/k8s.io/code-generator/cmd/openapi-gen/main.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/kube-openapi/pkg/generators"
 
 	generatorargs "k8s.io/code-generator/cmd/openapi-gen/args"
+	"k8s.io/code-generator/pkg/util"
 )
 
 func main() {
@@ -36,7 +37,7 @@ func main() {
 
 	// Override defaults.
 	// TODO: move this out of openapi-gen
-	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	genericArgs.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 
 	genericArgs.AddFlags(pflag.CommandLine)
 	customArgs.AddFlags(pflag.CommandLine)

vendor/k8s.io/code-generator/cmd/set-gen/BUILD

@@ -9,7 +9,6 @@ load(
 go_binary(
     name = "set-gen",
     embed = [":go_default_library"],
-    importpath = "k8s.io/code-generator/cmd/set-gen",
 )
 
 exports_files([
@@ -22,6 +21,7 @@ go_library(
     importpath = "k8s.io/code-generator/cmd/set-gen",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/code-generator/pkg/util:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/examples/set-gen/generators:go_default_library",
     ],

vendor/k8s.io/code-generator/cmd/set-gen/main.go

@@ -28,6 +28,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"k8s.io/code-generator/pkg/util"
 	"k8s.io/gengo/args"
 	"k8s.io/gengo/examples/set-gen/generators"
 
@@ -38,7 +39,7 @@ func main() {
 	arguments := args.Default()
 
 	// Override defaults.
-	arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
+	arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), util.BoilerplatePath())
 	arguments.InputDirs = []string{"k8s.io/kubernetes/pkg/util/sets/types"}
 	arguments.OutputPackagePath = "k8s.io/apimachinery/pkg/util/sets"