Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
347c3612
Commit
347c3612
authored
Jun 07, 2018
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set gazelle:importmap_prefix for everything under staging/src
parent
4c7c058a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
def.bzl
pkg/generated/openapi/def.bzl
+10
-4
def.bzl
pkg/version/def.bzl
+1
-2
BUILD
staging/src/BUILD
+1
-0
BUILD
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
+2
-1
No files found.
pkg/generated/openapi/def.bzl
View file @
347c3612
...
@@ -31,15 +31,21 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
...
@@ -31,15 +31,21 @@ def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_tar
name = "zz_generated.openapi",
name = "zz_generated.openapi",
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"],
# In order for vendored dependencies to be imported correctly,
# the generator must run from the repo root inside the generated GOPATH.
# All of bazel's $(location)s are relative to the original working directory, however,
# so we must save it first.
cmd = " ".join([
cmd = " ".join([
"$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)",
"ORIG_WD=$$(pwd);",
"cd $$GOPATH/src/" + go_prefix + ";",
"$$ORIG_WD/$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)",
"--v 1",
"--v 1",
"--logtostderr",
"--logtostderr",
"--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)",
"--go-header-file $
$ORIG_WD/$
(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)",
"--output-file-base zz_generated.openapi",
"--output-file-base zz_generated.openapi",
"--output-package " + go_prefix + "pkg/generated/openapi",
"--output-package " + go_prefix + "pkg/generated/openapi",
"--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] +
vendor_targets
),
"--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] +
[go_prefix + "vendor/" + target for target in vendor_targets]
),
"&& cp $$GOPATH/src/" + go_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 $
$ORIG_WD/$
(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"],
...
...
pkg/version/def.bzl
View file @
347c3612
...
@@ -17,8 +17,7 @@ def version_x_defs():
...
@@ -17,8 +17,7 @@ def version_x_defs():
# This should match the list of packages in kube::version::ldflag
# This should match the list of packages in kube::version::ldflag
stamp_pkgs = [
stamp_pkgs = [
"k8s.io/kubernetes/pkg/version",
"k8s.io/kubernetes/pkg/version",
# In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here?
"k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version",
"k8s.io/client-go/pkg/version",
]
]
# This should match the list of vars in kube::version::ldflags
# This should match the list of vars in kube::version::ldflags
...
...
staging/src/BUILD
View file @
347c3612
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
# "k8s.io/kubernetes/staging/src" to the importpath.
# "k8s.io/kubernetes/staging/src" to the importpath.
# Using this directive ensures that it sets the correct importpath.
# Using this directive ensures that it sets the correct importpath.
# gazelle:prefix
# gazelle:prefix
# gazelle:importmap_prefix k8s.io/kubernetes/vendor
filegroup(
filegroup(
name = "package-srcs",
name = "package-srcs",
...
...
staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
View file @
347c3612
...
@@ -20,6 +20,7 @@ go_library(
...
@@ -20,6 +20,7 @@ go_library(
importpath = "k8s.io/apimachinery/pkg/util/sets",
importpath = "k8s.io/apimachinery/pkg/util/sets",
)
)
# This rule makes all sorts of terrible assumptions that it's running inside k8s.io/kubernetes, even though it's part of k8s.io/apimachinery. :\
go_genrule(
go_genrule(
name = "set-gen",
name = "set-gen",
srcs = [
srcs = [
...
@@ -35,7 +36,7 @@ go_genrule(
...
@@ -35,7 +36,7 @@ go_genrule(
],
],
cmd = """
cmd = """
$(location //vendor/k8s.io/code-generator/cmd/set-gen) \
$(location //vendor/k8s.io/code-generator/cmd/set-gen) \
--input-dirs k8s.io/apimachinery/pkg/util/sets/types \
--input-dirs k8s.io/
kubernetes/vendor/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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment