From 801679ed8987dfd9cc45f2f7a157a7c4b276033f Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 29 Oct 2018 12:54:33 -0700 Subject: [PATCH] bazel: use starlark implementations of http_archive and http_file --- build/root/WORKSPACE | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index e0e2e45240..c1dcb95b29 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -1,3 +1,4 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") load("//build:workspace_mirror.bzl", "mirror") load("//build:workspace.bzl", "CRI_TOOLS_VERSION") @@ -23,9 +24,9 @@ http_archive( ETCD_VERSION = "3.2.24" -new_http_archive( +http_archive( name = "com_coreos_etcd", - build_file = "third_party/etcd.BUILD", + build_file = "@//third_party:etcd.BUILD", sha256 = "947849dbcfa13927c81236fb76a7c01d587bbab42ab1e807184cd91b026ebed7", strip_prefix = "etcd-v%s-linux-amd64" % ETCD_VERSION, urls = mirror("https://github.com/coreos/etcd/releases/download/v%s/etcd-v%s-linux-amd64.tar.gz" % (ETCD_VERSION, ETCD_VERSION)), @@ -55,12 +56,14 @@ docker_repositories() http_file( name = "kubernetes_cni", + downloaded_file_path = "kubernetes_cni.tgz", sha256 = "f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d", urls = mirror("https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz"), ) http_file( name = "cri_tools", + downloaded_file_path = "cri_tools.tgz", sha256 = "e7d913bcce40bf54e37ab1d4b75013c823d0551e6bc088b217bc1893207b4844", urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-amd64.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION)), )