github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Use new go_genrule from kubernetes/repo-infra based on go_path

Browse Source
This commit is contained in:
Jeff Grafton 2018-05-18 15:20:56 -07:00
parent d3a22cbd2f
commit 095a9e53ca
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/root/WORKSPACE
View File

@ -9,9 +9,9 @@ http_archive(
http_archive( http_archive(
name = "io_kubernetes_build", name = "io_kubernetes_build",
sha256 = "007774f06536059f3f782d1a092bddc625d88c17f20bbe731cea844a52485b11", sha256 = "6d87da8d97ccac3702eb9894541c32dd19a312f783f863e44bf8262d05dfaf2e",
strip_prefix = "repo-infra-97099dccc8807e9159dc28f374a8f0602cab07e1", strip_prefix = "repo-infra-3c350a455362b622fe786e63f8f07b2a87f54f7b",
urls = mirror("https://github.com/kubernetes/repo-infra/archive/97099dccc8807e9159dc28f374a8f0602cab07e1.tar.gz"), urls = mirror("https://github.com/kubernetes/repo-infra/archive/3c350a455362b622fe786e63f8f07b2a87f54f7b.tar.gz"),
) )
http_archive( http_archive(

11
pkg/generated/openapi/def.bzl
View File

@ -19,16 +19,17 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
deps = [ deps = [
"//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//vendor/%s:go_default_library" % target for target in vendor_targets] ] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//staging/src/%s:go_default_library" % target for target in vendor_targets]
go_library( go_library(
name = name, name = name,
srcs = srcs + [":zz_generated.openapi"], srcs = srcs + [":zz_generated.openapi"],
importpath = go_prefix + "pkg/generated/openapi",
tags = tags, tags = tags,
deps = deps, deps = deps,
) )
go_genrule( go_genrule(
name = "zz_generated.openapi", name = "zz_generated.openapi",
srcs = srcs + ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"], srcs = ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"],
outs = ["zz_generated.openapi.go"], outs = ["zz_generated.openapi.go"],
cmd = " ".join([ cmd = " ".join([
"$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)", "$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)",
@ -36,9 +37,9 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
"--logtostderr", "--logtostderr",
"--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)", "--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)",
"--output-file-base zz_generated.openapi", "--output-file-base zz_generated.openapi",
"--output-package " + go_prefix + vendor_prefix + "pkg/generated/openapi", "--output-package " + go_prefix + "pkg/generated/openapi",
"--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + [go_prefix + "vendor/" + target for target in vendor_targets]), "--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + vendor_targets),
"&& cp " + vendor_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)", "&& cp $$GOPATH/src/" + go_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)",
]), ]),
go_deps = deps, go_deps = deps,
tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"], tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"],

4
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
View File

@ -35,13 +35,13 @@ go_genrule(
], ],
cmd = """ cmd = """
$(location //vendor/k8s.io/code-generator/cmd/set-gen) \ $(location //vendor/k8s.io/code-generator/cmd/set-gen) \
--input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \ --input-dirs k8s.io/apimachinery/pkg/util/sets/types \
--output-base $$(dirname $$(dirname $(location :byte.go))) \ --output-base $$(dirname $$(dirname $(location :byte.go))) \
--go-header-file $(location //hack/boilerplate:boilerplate.generatego.txt) \ --go-header-file $(location //hack/boilerplate:boilerplate.generatego.txt) \
--output-package sets --output-package sets
""", """,
go_deps = [ go_deps = [
"//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
], ],
tools = [ tools = [
"//vendor/k8s.io/code-generator/cmd/set-gen", "//vendor/k8s.io/code-generator/cmd/set-gen",