mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-04-12 00:00:26 +08:00
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
This commit is contained in:
+1
-1
@@ -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",
|
||||
],
|
||||
)
|
||||
|
||||
-1
@@ -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",
|
||||
|
||||
+1
-6
@@ -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 {
|
||||
|
||||
-1
@@ -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(
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
-1
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user