From 5aa25f8309a8dda88fec1fddce9e6316633202b7 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 5 Jun 2017 16:36:16 -0700 Subject: [PATCH 1/3] Bump bazelbuild/rules_go and kubernetes/repo-infra dependencies --- build/root/WORKSPACE | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 2c3814efc0b..b82d9ef9a55 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -1,15 +1,15 @@ http_archive( name = "io_bazel_rules_go", - sha256 = "64294fd0e74d2aafa03ec3a1f2f9c167e27d17c9a5cf393e8bf79e43258de73d", - strip_prefix = "rules_go-a9df110cf04e167b33f10473c7e904d780d921e6", - urls = ["https://github.com/bazelbuild/rules_go/archive/a9df110cf04e167b33f10473c7e904d780d921e6.tar.gz"], + sha256 = "a1596c14c799d5a1b5f49ca28fa948414c2242110d69ef324d6ed160ec890dbf", + strip_prefix = "rules_go-03c634753160632c00f506afeafc819fbea4c422", + urls = ["https://github.com/bazelbuild/rules_go/archive/03c634753160632c00f506afeafc819fbea4c422.tar.gz"], ) http_archive( name = "io_kubernetes_build", - sha256 = "8d1cff71523565996903076cec6cad8424afa6eb93a342d0d810a55c911e23c7", - strip_prefix = "repo-infra-61b7247ebf472398bdea148d8f67e3a1849d6de9", - urls = ["https://github.com/kubernetes/repo-infra/archive/61b7247ebf472398bdea148d8f67e3a1849d6de9.tar.gz"], + sha256 = "a9fb7027f060b868cdbd235a0de0971b557b9d26f9c89e422feb80f48d8c0e90", + strip_prefix = "repo-infra-9dedd5f4093884c133ad5ea73695b28338b954ab", + urls = ["https://github.com/kubernetes/repo-infra/archive/9dedd5f4093884c133ad5ea73695b28338b954ab.tar.gz"], ) # This contains a patch to not prepend ./ to tarfiles produced by pkg_tar. From 14e1889372d2a2ff21d95ded406767d2fe18c7b1 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Tue, 6 Jun 2017 15:14:57 -0700 Subject: [PATCH 2/3] Disable verify-gofmt bazel test --- hack/BUILD | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hack/BUILD b/hack/BUILD index b78a10a5217..24172447c54 100644 --- a/hack/BUILD +++ b/hack/BUILD @@ -27,21 +27,23 @@ sh_test( tags = ["manual"], ) -sh_test( - name = "verify-gofmt", - srcs = ["verify-gofmt.sh"], - data = [ - "//:all-srcs", - "@io_bazel_rules_go_toolchain//:toolchain", - ], - tags = ["manual"], -) +# Disable gofmt test until we can figure out how to access the gofmt binary. +# https://github.com/bazelbuild/rules_go/issues/511 +#sh_test( +# name = "verify-gofmt", +# srcs = ["verify-gofmt.sh"], +# data = [ +# "//:all-srcs", +# "@io_bazel_rules_go_toolchain//:toolchain", +# ], +# tags = ["manual"], +#) test_suite( name = "verify-all", tags = ["manual"], tests = [ "verify-boilerplate", - "verify-gofmt", + # "verify-gofmt", ], ) From 64bd79fad78d39788bd1073b836cd5fe89cc29e3 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 5 Jun 2017 16:37:19 -0700 Subject: [PATCH 3/3] 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 fc3284c570d..d635b5548a4 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 830eb17c260..17849ebea75 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 25065474ade..373aad377b4 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 9554727c378..96bd4e5d630 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 d88ed1114bf..ee0d501d9f9 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 0bbf605f3df..f15bf064725 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 16e829dbf4d..3d6c79e184e 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 3e54d636515..6995ac589d4 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 748aacdaedc..ac96072df38 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 a20e593a140..6df0b9530e3 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 <