From a8c528dccd6395f9b7b9c8590e12ce0be5b879fb Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 13 Jan 2017 16:36:02 -0800 Subject: [PATCH 1/2] add a TODO --- build/release-tars/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD index 3eea73c2328..22781bd1564 100644 --- a/build/release-tars/BUILD +++ b/build/release-tars/BUILD @@ -197,6 +197,7 @@ pkg_tar( name = "kubernetes", extension = "tar.gz", files = [ + # TODO: the version file "//:Godeps/LICENSES", "//:README.md", "//:Vagrantfile", From 16aa59c34a8a209148331e792e99b37dcd3c7668 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Wed, 18 Jan 2017 17:07:55 -0800 Subject: [PATCH 2/2] bazel: add a config setting to control embedding kubernetes-src.tar.gz --- build/release-tars/BUILD | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD index 22781bd1564..2acc37865c2 100644 --- a/build/release-tars/BUILD +++ b/build/release-tars/BUILD @@ -15,6 +15,14 @@ filegroup( tags = ["automanaged"], ) +config_setting( + name = "embed_license_targets", + values = { + "define": "EMBED_LICENSE_TARGETS=true", + }, + visibility = ["//visibility:private"], +) + pkg_tar( name = "kubernetes-src", extension = "tar.gz", @@ -116,7 +124,10 @@ pkg_tar( pkg_tar( name = "kubernetes-node-%s" % PLATFORM_ARCH_STRING, extension = "tar.gz", - files = LICENSE_TARGETS, + files = select({ + ":embed_license_targets": LICENSE_TARGETS, + "//conditions:default": [], + }), mode = "0644", package_dir = "kubernetes", deps = [ @@ -153,7 +164,10 @@ pkg_tar( pkg_tar( name = "kubernetes-server-%s" % PLATFORM_ARCH_STRING, extension = "tar.gz", - files = LICENSE_TARGETS, + files = select({ + ":embed_license_targets": LICENSE_TARGETS, + "//conditions:default": [], + }), mode = "0644", package_dir = "kubernetes", deps = [ @@ -198,14 +212,16 @@ pkg_tar( extension = "tar.gz", files = [ # TODO: the version file - "//:Godeps/LICENSES", "//:README.md", "//:Vagrantfile", "//cluster:all-srcs", "//docs:all-srcs", "//examples:all-srcs", "//third_party/htpasswd:all-srcs", - ], + ] + select({ + ":embed_license_targets": ["//:Godeps/LICENSES"], + "//conditions:default": [], + }), package_dir = "kubernetes", strip_prefix = "//", deps = [