From dc6920df97c0439f371b0c5f03f0256bb3ba1d98 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Thu, 27 Feb 2020 18:12:50 +0000
Subject: [PATCH] Tidy up and upgrade dependencies in deps.bzl

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 hack/bin/BUILD.bazel | 86 ++++----------------------------------------
 hack/bin/deps.bzl    | 16 ++++-----
 2 files changed, 15 insertions(+), 87 deletions(-)

diff --git a/hack/bin/BUILD.bazel b/hack/bin/BUILD.bazel
index 4b130b36a..cf404dcae 100644
--- a/hack/bin/BUILD.bazel
+++ b/hack/bin/BUILD.bazel
@@ -25,10 +25,10 @@ genrule(
 )
 
 genrule(
-    name = "fetch_etcd",
+    name = "com_coreos_etcd",
     srcs = select({
-        ":darwin": ["@etcd_v3_3_darwin//:file"],
-        ":k8": ["@etcd_v3_3_linux//:file"],
+        ":darwin": ["@com_coreos_etcd_darwin_amd64//:file"],
+        ":k8": ["@com_coreos_etcd_linux_amd64//:file"],
     }),
     outs = ["etcd"],
     cmd = "cp $(SRCS) $@",
@@ -36,10 +36,10 @@ genrule(
 )
 
 genrule(
-    name = "fetch_kube-apiserver",
+    name = "io_kubernetes_kube-apiserver",
     srcs = select({
-        ":darwin": ["@kube-apiserver_1_14_darwin//file"],
-        ":k8": ["@kube-apiserver_1_14_linux//file"],
+        ":darwin": ["@kube-apiserver_darwin_amd64//file"],
+        ":k8": ["@kube-apiserver_linux_amd64//file"],
     }),
     outs = ["kube-apiserver"],
     cmd = "cp $(SRCS) $@",
@@ -47,83 +47,11 @@ genrule(
 )
 
 genrule(
-    name = "fetch_kubectl_1_11",
-    srcs = select({
-        ":darwin": ["@kubectl_1_11_darwin//file"],
-        ":k8": ["@kubectl_1_11_linux//file"],
-    }),
-    outs = ["kubectl-1.11"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl_1_12",
-    srcs = select({
-        ":darwin": ["@kubectl_1_12_darwin//file"],
-        ":k8": ["@kubectl_1_12_linux//file"],
-    }),
-    outs = ["kubectl-1.12"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl_1_13",
-    srcs = select({
-        ":darwin": ["@kubectl_1_13_darwin//file"],
-        ":k8": ["@kubectl_1_13_linux//file"],
-    }),
-    outs = ["kubectl-1.13"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl_1_14",
-    srcs = select({
-        ":darwin": ["@kubectl_1_14_darwin//file"],
-        ":k8": ["@kubectl_1_14_linux//file"],
-    }),
-    outs = ["kubectl-1.14"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl_1_15",
-    srcs = select({
-        ":darwin": ["@kubectl_1_15_darwin//file"],
-        ":k8": ["@kubectl_1_15_linux//file"],
-    }),
-    outs = ["kubectl-1.15"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl_1_16",
+    name = "fetch_kubectl",
     srcs = select({
         ":darwin": ["@kubectl_1_16_darwin//file"],
         ":k8": ["@kubectl_1_16_linux//file"],
     }),
-    outs = ["kubectl-1.16"],
-    cmd = "cp $(SRCS) $@",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "fetch_kubectl",
-    srcs = select({
-        ":darwin": ["@kubectl_1_13_darwin//file"],
-        ":k8": ["@kubectl_1_13_linux//file"],
-    }),
     outs = ["kubectl"],
     cmd = "cp $(SRCS) $@",
     tags = ["manual"],
diff --git a/hack/bin/deps.bzl b/hack/bin/deps.bzl
index 0a2fb7d2e..87895cd9b 100644
--- a/hack/bin/deps.bzl
+++ b/hack/bin/deps.bzl
@@ -53,21 +53,21 @@ def install_misc():
 # Install dependencies used by the controller-runtime integration test framework
 def install_integration_test_dependencies():
     http_file(
-        name = "kube-apiserver_1_14_darwin",
+        name = "kube-apiserver_darwin_amd64",
         executable = 1,
-        sha256 = "8a7a21a5683386998ebd3a4fe9af346626ebdaf84a59094a2b2188e59e13b6d6",
-        urls = ["https://storage.googleapis.com/cert-manager-testing-assets/kube-apiserver-1.14.1_darwin_amd64"],
+        sha256 = "a874d479f183f9e4c19a5c69b44955fabd2e250b467d2d9f0641ae91a82ddbea",
+        urls = ["https://storage.googleapis.com/cert-manager-testing-assets/kube-apiserver-1.17.3_darwin_amd64"],
     )
 
     http_file(
-        name = "kube-apiserver_1_14_linux",
+        name = "kube-apiserver_linux_amd64",
         executable = 1,
-        sha256 = "1ce67dda7b125dc1adadc10ab93fe339f6ce40211ae4f1552d6de177e36a430d",
-        urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kube-apiserver"],
+        sha256 = "b4505b838b27b170531afbdef5e7bfaacf83da665f21b0e3269d1775b0defb7a",
+        urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/linux/amd64/kube-apiserver"],
     )
 
     http_archive(
-        name = "etcd_v3_3_darwin",
+        name = "com_coreos_etcd_darwin_amd64",
         sha256 = "c8f36adf4f8fb7e974f9bafe6e390a03bc33e6e465719db71d7ed3c6447ce85a",
         urls = ["https://github.com/etcd-io/etcd/releases/download/v3.3.12/etcd-v3.3.12-darwin-amd64.zip"],
         build_file_content = """
@@ -82,7 +82,7 @@ filegroup(
     )
 
     http_archive(
-        name = "etcd_v3_3_linux",
+        name = "com_coreos_etcd_linux_amd64",
         sha256 = "dc5d82df095dae0a2970e4d870b6929590689dd707ae3d33e7b86da0f7f211b6",
         urls = ["https://github.com/etcd-io/etcd/releases/download/v3.3.12/etcd-v3.3.12-linux-amd64.tar.gz"],
         build_file_content = """