Merge pull request #90575 from thockin/fix_license_again

Reorganize vendor licenses again (revert #85220)

build/common.sh

@@ -730,7 +730,6 @@ function kube::build::copy_output() {
     --prune-empty-dirs \
     --filter='- /_temp/' \
     --filter='+ /vendor/' \
-    --filter='+ /Godeps/' \
     --filter='+ /staging/***/Godeps/**' \
     --filter='+ /_output/dockerized/bin/**' \
     --filter='+ zz_generated.*' \

build/lib/release.sh

@@ -203,7 +203,7 @@ function kube::release::package_node_tarballs() {
     cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
       "${release_stage}/node/bin/"
 
-    cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
+    cp -R "${KUBE_ROOT}/LICENSES" "${release_stage}/"
 
     cp "${RELEASE_TARS}/kubernetes-src.tar.gz" "${release_stage}/"
 
@@ -275,7 +275,7 @@ function kube::release::package_server_tarballs() {
     cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
       "${release_stage}/server/bin/"
 
-    cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
+    cp -R "${KUBE_ROOT}/LICENSES" "${release_stage}/"
 
     cp "${RELEASE_TARS}/kubernetes-src.tar.gz" "${release_stage}/"
 
@@ -559,7 +559,7 @@ EOF
 
   cp -R "${KUBE_ROOT}/docs" "${release_stage}/"
   cp "${KUBE_ROOT}/README.md" "${release_stage}/"
-  cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
+  cp -R "${KUBE_ROOT}/LICENSES" "${release_stage}/"
 
   echo "${KUBE_GIT_VERSION}" > "${release_stage}/version"
 

build/release-tars/BUILD

@@ -70,13 +70,20 @@ pkg_tar(
 )
 
 # Included in node and server tarballs.
-filegroup(
-    name = "license-targets",
+pkg_tar(
+    name = "license-artifacts",
     srcs = [
-        ":kubernetes-src.tar.gz",
-        "//:Godeps/LICENSES",
+        ":kubernetes-src.tar.gz",  # we want the tar file itself
+    ],
+    mode = "0755",
+    tags = [
+        "manual",
+        "no-cache",
     ],
     visibility = ["//visibility:private"],
+    deps = [
+        "//:LICENSES",  # we want to expand this
+    ],
 )
 
 pkg_tar(
@@ -119,7 +126,7 @@ pkg_tar(
 
 [[pkg_tar(
     name = "kubernetes-node-%s-%s" % (os, arch),
-    srcs = [":license-targets"],
+    srcs = [],
     extension = "tar.gz",
     mode = "0644",
     package_dir = "kubernetes",
@@ -127,7 +134,9 @@ pkg_tar(
         "manual",
         "no-cache",
     ],
-    deps = select({go_platform_constraint(os, arch): [":_node-bin"]}),
+    deps = select({go_platform_constraint(os, arch): [":_node-bin"]}) + [
+        ":license-artifacts",
+    ],
 ) for arch in archs] for os, archs in NODE_PLATFORMS.items()]
 
 pkg_tar(
@@ -170,7 +179,7 @@ pkg_tar(
 
 [[pkg_tar(
     name = "kubernetes-server-%s-%s" % (os, arch),
-    srcs = [":license-targets"],
+    srcs = [],
     extension = "tar.gz",
     mode = "0644",
     package_dir = "kubernetes",
@@ -183,7 +192,9 @@ pkg_tar(
             ":_server-addons",
             ":_server-bin",
         ],
-    }),
+    }) + [
+        ":license-artifacts",
+    ],
 ) for arch in archs] for os, archs in SERVER_PLATFORMS.items()]
 
 pkg_tar(
@@ -235,7 +246,6 @@ pkg_tar(
 pkg_tar(
     name = "kubernetes",
     srcs = [
-        "//:Godeps/LICENSES",
         "//:README.md",
         "//:version",
         "//cluster:all-srcs",
@@ -253,6 +263,7 @@ pkg_tar(
     tags = ["no-cache"],
     deps = [
         ":_full_server",
+        ":license-artifacts",
     ],
 )
 

build/root/BUILD.root

@@ -17,6 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@io_k8s_repo_infra//defs:build.bzl", "gcs_upload")
+load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
 load("//build:platforms.bzl", "for_platforms")
 
 filegroup(
@@ -124,3 +125,18 @@ platform(
       {PARENT_REMOTE_EXECUTION_PROPERTIES}
     """,
 )
+
+pkg_tar(
+    name = "LICENSES",
+    srcs = glob(
+        ["LICENSES/**/LICENSE"],
+        allow_empty = False,
+        exclude_directories = 0,
+    ),
+    mode = "0755",
+    strip_prefix = "//",
+    tags = [
+        "manual",
+        "no-cache",
+    ],
+)