From 64bd79fad78d39788bd1073b836cd5fe89cc29e3 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Mon, 5 Jun 2017 16:37:19 -0700
Subject: [PATCH] Convert go_binary linkstamp to x_defs

---
 cmd/cloud-controller-manager/BUILD            |  3 ++-
 cmd/hyperkube/BUILD                           |  3 ++-
 cmd/kube-apiserver/BUILD                      |  3 ++-
 cmd/kube-controller-manager/BUILD             |  3 ++-
 cmd/kube-proxy/BUILD                          |  3 ++-
 cmd/kubeadm/BUILD                             |  3 ++-
 cmd/kubectl/BUILD                             |  3 ++-
 cmd/kubelet/BUILD                             |  3 ++-
 hack/lib/version.sh                           |  3 +++
 hack/print-workspace-status.sh                |  2 ++
 pkg/version/def.bzl                           | 24 +++++++++++++++++++
 plugin/cmd/kube-scheduler/BUILD               |  3 ++-
 .../src/k8s.io/client-go/pkg/version/def.bzl  | 24 +++++++++++++++++++
 staging/src/k8s.io/kube-aggregator/BUILD      |  3 ++-
 14 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 pkg/version/def.bzl
 create mode 100644 staging/src/k8s.io/client-go/pkg/version/def.bzl

diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD
index fc3284c570..d635b5548a 100644
--- a/cmd/cloud-controller-manager/BUILD
+++ b/cmd/cloud-controller-manager/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "cloud-controller-manager",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD
index 830eb17c26..17849ebea7 100644
--- a/cmd/hyperkube/BUILD
+++ b/cmd/hyperkube/BUILD
@@ -8,12 +8,13 @@ load(
     "go_library",
     "go_test",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "hyperkube",
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_test(
diff --git a/cmd/kube-apiserver/BUILD b/cmd/kube-apiserver/BUILD
index 25065474ad..373aad377b 100644
--- a/cmd/kube-apiserver/BUILD
+++ b/cmd/kube-apiserver/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kube-apiserver",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD
index 9554727c37..96bd4e5d63 100644
--- a/cmd/kube-controller-manager/BUILD
+++ b/cmd/kube-controller-manager/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kube-controller-manager",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD
index d88ed1114b..ee0d501d9f 100644
--- a/cmd/kube-proxy/BUILD
+++ b/cmd/kube-proxy/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kube-proxy",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD
index 0bbf605f3d..f15bf06472 100644
--- a/cmd/kubeadm/BUILD
+++ b/cmd/kubeadm/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kubeadm",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD
index 16e829dbf4..3d6c79e184 100644
--- a/cmd/kubectl/BUILD
+++ b/cmd/kubectl/BUILD
@@ -5,6 +5,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kubectl",
@@ -15,11 +16,11 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
     visibility = [
         "//build/visible_to:COMMON_release",
     ],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/cmd/kubelet/BUILD b/cmd/kubelet/BUILD
index 3e54d63651..6995ac589d 100644
--- a/cmd/kubelet/BUILD
+++ b/cmd/kubelet/BUILD
@@ -7,12 +7,13 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kubelet",
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/hack/lib/version.sh b/hack/lib/version.sh
index 748aacdaed..ac96072df3 100644
--- a/hack/lib/version.sh
+++ b/hack/lib/version.sh
@@ -118,12 +118,15 @@ kube::version::ldflag() {
   local key=${1}
   local val=${2}
 
+  # If you update these, also update the list pkg/version/def.bzl.
   echo "-X ${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}"
   echo "-X ${KUBE_GO_PACKAGE}/vendor/k8s.io/client-go/pkg/version.${key}=${val}"
 }
 
 # Prints the value that needs to be passed to the -ldflags parameter of go build
 # in order to set the Kubernetes based on the git tree status.
+# IMPORTANT: if you update any of these, also update the lists in
+# pkg/version/def.bzl and hack/print-workspace-status.sh.
 kube::version::ldflags() {
   kube::version::get_version_vars
 
diff --git a/hack/print-workspace-status.sh b/hack/print-workspace-status.sh
index a20e593a14..6df0b9530e 100755
--- a/hack/print-workspace-status.sh
+++ b/hack/print-workspace-status.sh
@@ -29,6 +29,8 @@ kube::version::get_version_vars
 # instead of volatile-status.txt.
 # Stamped rules will be retriggered by changes to stable-status.txt, but not by
 # changes to volatile-status.txt.
+# IMPORTANT: the camelCase vars should match the lists in hack/lib/version.sh
+# and pkg/version/def.bzl.
 cat <<EOF
 STABLE_BUILD_GIT_COMMIT ${KUBE_GIT_COMMIT-}
 STABLE_BUILD_SCM_STATUS ${KUBE_GIT_TREE_STATE-}
diff --git a/pkg/version/def.bzl b/pkg/version/def.bzl
new file mode 100644
index 0000000000..bca85ab4b5
--- /dev/null
+++ b/pkg/version/def.bzl
@@ -0,0 +1,24 @@
+# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel.
+def version_x_defs():
+  # This should match the list of packages in kube::version::ldflag
+  stamp_pkgs = [
+      "k8s.io/kubernetes/pkg/version",
+      # In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here?
+      "k8s.io/client-go/pkg/version",
+      ]
+  # This should match the list of vars in kube::version::ldflags
+  # It should also match the list of vars set in hack/print-workspace-status.sh.
+  stamp_vars = [
+      "buildDate",
+      "gitCommit",
+      "gitMajor",
+      "gitMinor",
+      "gitTreeState",
+      "gitVersion",
+  ]
+  # Generate the cross-product.
+  x_defs = {}
+  for pkg in stamp_pkgs:
+    for var in stamp_vars:
+      x_defs["%s.%s" % (pkg, var)] = "{%s}" % var
+  return x_defs
diff --git a/plugin/cmd/kube-scheduler/BUILD b/plugin/cmd/kube-scheduler/BUILD
index a2c84ed9b4..3027519483 100644
--- a/plugin/cmd/kube-scheduler/BUILD
+++ b/plugin/cmd/kube-scheduler/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kube-scheduler",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(
diff --git a/staging/src/k8s.io/client-go/pkg/version/def.bzl b/staging/src/k8s.io/client-go/pkg/version/def.bzl
new file mode 100644
index 0000000000..bca85ab4b5
--- /dev/null
+++ b/staging/src/k8s.io/client-go/pkg/version/def.bzl
@@ -0,0 +1,24 @@
+# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel.
+def version_x_defs():
+  # This should match the list of packages in kube::version::ldflag
+  stamp_pkgs = [
+      "k8s.io/kubernetes/pkg/version",
+      # In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here?
+      "k8s.io/client-go/pkg/version",
+      ]
+  # This should match the list of vars in kube::version::ldflags
+  # It should also match the list of vars set in hack/print-workspace-status.sh.
+  stamp_vars = [
+      "buildDate",
+      "gitCommit",
+      "gitMajor",
+      "gitMinor",
+      "gitTreeState",
+      "gitVersion",
+  ]
+  # Generate the cross-product.
+  x_defs = {}
+  for pkg in stamp_pkgs:
+    for var in stamp_vars:
+      x_defs["%s.%s" % (pkg, var)] = "{%s}" % var
+  return x_defs
diff --git a/staging/src/k8s.io/kube-aggregator/BUILD b/staging/src/k8s.io/kube-aggregator/BUILD
index 8200c73050..187a8dc316 100644
--- a/staging/src/k8s.io/kube-aggregator/BUILD
+++ b/staging/src/k8s.io/kube-aggregator/BUILD
@@ -7,6 +7,7 @@ load(
     "go_binary",
     "go_library",
 )
+load("//vendor/k8s.io/client-go/pkg/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "kube-aggregator",
@@ -17,8 +18,8 @@ go_binary(
         "-static",
     ],
     library = ":go_default_library",
-    linkstamp = "k8s.io/kubernetes/pkg/version",
     tags = ["automanaged"],
+    x_defs = version_x_defs(),
 )
 
 go_library(