From 40a782cf368d2bd5b6ebd38a1779221a51dc8214 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Mon, 30 Apr 2018 12:37:57 -0700
Subject: [PATCH 1/2] Fix pkg_rpm rules for bazel 0.13+

---
 build/rpms/BUILD               | 12 ++++++++++++
 build/rpms/kubeadm.spec        |  6 +++---
 build/rpms/kubectl.spec        |  2 +-
 build/rpms/kubelet.spec        |  4 ++--
 build/rpms/kubernetes-cni.spec |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build/rpms/BUILD b/build/rpms/BUILD
index e459dc0daf0..041607c94bd 100644
--- a/build/rpms/BUILD
+++ b/build/rpms/BUILD
@@ -2,6 +2,18 @@ package(default_visibility = ["//visibility:public"])
 
 load("@bazel_tools//tools/build_defs/pkg:rpm.bzl", "pkg_rpm")
 
+filegroup(
+    name = "rpms",
+    srcs = [
+        ":kubeadm",
+        ":kubectl",
+        ":kubelet",
+        ":kubernetes-cni",
+    ],
+    tags = ["manual"],
+    visibility = ["//visibility:public"],
+)
+
 pkg_rpm(
     name = "kubectl",
     architecture = "x86_64",
diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index 3de4b129e31..53a992eb3c0 100644
--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -17,9 +17,9 @@ install -m 755 -d %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/
 install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 755 -t %{buildroot}%{_bindir} kubeadm
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ 10-kubeadm.conf
-install -p -m 755 -T kubelet.env %{buildroot}%{_sysconfdir}/sysconfig/kubelet
+install -p -m 755 -t %{buildroot}%{_bindir} {kubeadm}
+install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/kubelet.service.d/ {10-kubeadm.conf}
+install -p -m 755 -T {kubelet.env} %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 
 %files
 %{_bindir}/kubeadm
diff --git a/build/rpms/kubectl.spec b/build/rpms/kubectl.spec
index 247dc3fa0fb..adcc32b9368 100644
--- a/build/rpms/kubectl.spec
+++ b/build/rpms/kubectl.spec
@@ -12,7 +12,7 @@ Command-line utility for interacting with a Kubernetes cluster.
 %install
 
 install -m 755 -d %{buildroot}%{_bindir}
-install -p -m 755 -t %{buildroot}%{_bindir} kubectl
+install -p -m 755 -t %{buildroot}%{_bindir} {kubectl}
 
 %files
 %{_bindir}/kubectl
diff --git a/build/rpms/kubelet.spec b/build/rpms/kubelet.spec
index cde8afa584f..d5e85bf9082 100644
--- a/build/rpms/kubelet.spec
+++ b/build/rpms/kubelet.spec
@@ -22,8 +22,8 @@ The node agent of Kubernetes, the container cluster manager.
 install -m 755 -d %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/systemd/system/
 install -m 755 -d %{buildroot}%{_sysconfdir}/kubernetes/manifests/
-install -p -m 755 -t %{buildroot}%{_bindir} kubelet
-install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/ kubelet.service
+install -p -m 755 -t %{buildroot}%{_bindir} {kubelet}
+install -p -m 755 -t %{buildroot}%{_sysconfdir}/systemd/system/ {kubelet.service}
 
 %files
 %{_bindir}/kubelet
diff --git a/build/rpms/kubernetes-cni.spec b/build/rpms/kubernetes-cni.spec
index 70627fe4dd6..4b4751d11cf 100644
--- a/build/rpms/kubernetes-cni.spec
+++ b/build/rpms/kubernetes-cni.spec
@@ -11,7 +11,7 @@ Binaries required to provision container networking.
 
 %prep
 mkdir -p ./bin
-tar -C ./bin -xz -f cni-plugins-amd64-v0.6.0.tgz
+tar -C ./bin -xz -f {cni-plugins-amd64-v0.6.0.tgz}
 
 %install
 

From 29478953f39ba8c68031f19e3463f1669ac8e5bb Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 1 May 2018 16:26:01 -0700
Subject: [PATCH 2/2] Ratchet to bazel 0.13.0+

---
 build/root/WORKSPACE | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index c6ea40e4eca..e7de9218295 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -39,7 +39,7 @@ http_archive(
 
 load("@bazel_skylib//:lib.bzl", "versions")
 
-versions.check(minimum_bazel_version = "0.10.0")
+versions.check(minimum_bazel_version = "0.13.0")
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains", "go_download_sdk")
 load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")
@@ -83,4 +83,5 @@ docker_pull(
 )
 
 load("//build:workspace_mirror.bzl", "export_urls")
+
 export_urls("workspace_urls")