Merge pull request kubernetes#74153 from ixdy/bazel-kubernetes-src-tarball-new

bazel: make kubernetes-src.tar.gz actually include all srcs

Author: k8s-ci-robot

build/release-tars/BUILD

@@ -11,6 +11,7 @@ load(
 )
 load("@io_k8s_repo_infra//defs:build.bzl", "release_filegroup")
 load("@io_k8s_repo_infra//defs:pkg.bzl", "pkg_tar")
+load("//staging:repos_generated.bzl", "staging_repos")
 
 # Bazel doesn't make the output filename
 # (such as kubernetes-server-{OS}-{ARCH}.tar.gz) configurable, so we instead
@@ -55,38 +56,16 @@ filegroup(
     tags = ["automanaged"],
 )
 
-config_setting(
-    name = "package_src",
-    values = {
-        "define": "PACKAGE_SRC=true",
-    },
-    visibility = ["//visibility:private"],
-)
-
-genrule(
-    name = "kubernetes-src-readme",
-    outs = ["README-src.txt"],
-    cmd = """
-echo For build efficiency, the src was not included in this release.>$@
-echo The full source code can be viewed at >>$@
-echo -n https://github.com/kubernetes/kubernetes/tree/ >>$@
-grep ^STABLE_BUILD_GIT_COMMIT bazel-out/stable-status.txt | cut -d' ' -f2 >>$@
-""",
-    stamp = 1,
-)
-
 pkg_tar(
     name = "kubernetes-src",
-    srcs = select({
-        ":package_src": ["//:all-srcs"],
-        "//conditions:default": ["README-src.txt"],
-    }),
+    srcs = ["//:all-srcs"],
     extension = "tar.gz",
     package_dir = "kubernetes",
-    strip_prefix = select({
-        ":package_src": "//",
-        "//conditions:default": ".",
-    }),
+    strip_prefix = "//",
+    symlinks = {
+        "kubernetes/vendor/%s" % repo: "../../staging/src/%s" % repo
+        for repo in staging_repos
+    },
     tags = [
         "manual",
         "no-cache",

hack/update-bazel.sh

@@ -18,7 +18,6 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-export KUBE_ROOT
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 # Ensure that we find the binaries we build before anything else.
@@ -30,20 +29,45 @@ go install k8s.io/kubernetes/vendor/github.com/bazelbuild/bazel-gazelle/cmd/gaze
 go install k8s.io/kubernetes/vendor/github.com/bazelbuild/buildtools/buildozer
 go install k8s.io/kubernetes/vendor/k8s.io/repo-infra/kazel
 
+# Find all of the staging repos.
+while IFS='' read -r repo; do staging_repos+=("${repo}"); done <\
+  <(cd "${KUBE_ROOT}/staging/src" && find k8s.io/ -mindepth 1 -maxdepth 1 -type d | LANG=C sort)
+
+# Save the staging repos into a Starlark list that can be used by Bazel rules.
+(
+  cat "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatebzl.txt"
+  echo "# This file is autogenerated by hack/update-bazel.sh."
+  # avoid getting caught by the boilerplate checker
+  rev <<<".TIDE TON OD #"
+  echo
+  echo "staging_repos = ["
+  for repo in "${staging_repos[@]}"; do
+    echo "    \"${repo}\","
+  done
+  echo "]"
+) >"${KUBE_ROOT}/staging/repos_generated.bzl"
+
+# Ensure there's a BUILD file at vendor/ so the all-srcs rule in the root
+# BUILD.bazel file is isolated from changes under vendor/.
 touch "${KUBE_ROOT}/vendor/BUILD"
-# Ensure that we use the correct importmap for all vendored dependencies.
-# Probably not necessary in gazelle 0.13+
-# (https://github.com/bazelbuild/bazel-gazelle/pull/207).
-if ! grep -q "# gazelle:importmap_prefix" "${KUBE_ROOT}/vendor/BUILD"; then
-  echo "# gazelle:importmap_prefix k8s.io/kubernetes/vendor" >> "${KUBE_ROOT}/vendor/BUILD"
-fi
+# Ensure there's a BUILD file at the root of each staging repo. This prevents
+# the package-srcs glob in vendor/BUILD from following the symlinks
+# from vendor/k8s.io into staging. Following these symlinks through
+# vendor results in files being excluded from the kubernetes-src tarball
+# generated by Bazel.
+for repo in "${staging_repos[@]}"; do
+  touch "${KUBE_ROOT}/staging/src/${repo}/BUILD"
+done
 
+# Run gazelle to update Go rules in BUILD files.
 gazelle fix \
     -external=vendored \
     -mode=fix \
     -repo_root "${KUBE_ROOT}" \
     "${KUBE_ROOT}"
 
+# Run kazel to update the pkg-srcs and all-srcs rules as well as handle
+# Kubernetes code generators.
 kazel
 
 # make targets in vendor manual

staging/repos_generated.bzl

@@ -0,0 +1,41 @@
+# Copyright The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is autogenerated by hack/update-bazel.sh.
+# DO NOT EDIT.
+
+staging_repos = [
+    "k8s.io/api",
+    "k8s.io/apiextensions-apiserver",
+    "k8s.io/apimachinery",
+    "k8s.io/apiserver",
+    "k8s.io/cli-runtime",
+    "k8s.io/client-go",
+    "k8s.io/cloud-provider",
+    "k8s.io/cluster-bootstrap",
+    "k8s.io/code-generator",
+    "k8s.io/component-base",
+    "k8s.io/csi-api",
+    "k8s.io/csi-translation-lib",
+    "k8s.io/kube-aggregator",
+    "k8s.io/kube-controller-manager",
+    "k8s.io/kube-proxy",
+    "k8s.io/kube-scheduler",
+    "k8s.io/kubelet",
+    "k8s.io/metrics",
+    "k8s.io/node-api",
+    "k8s.io/sample-apiserver",
+    "k8s.io/sample-cli-plugin",
+    "k8s.io/sample-controller",
+]