calico 3.14 -> 1.15
Change-Id: I9eceaf26017e483235b97c8d08717d2750fabe25
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/995
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/cluster/tools/BUILD b/cluster/tools/BUILD
index a63245e..e43a809 100644
--- a/cluster/tools/BUILD
+++ b/cluster/tools/BUILD
@@ -13,17 +13,13 @@
visibility = ["//visibility:public"],
)
-copy_go_binary(
- name = "calicoctl.bin",
- src = "@com_github_projectcalico_calicoctl//calicoctl:calicoctl",
- visibility = ["//visibility:public"],
-)
-
sh_binary(
name = "calicoctl",
srcs = ["calicoctl.sh"],
data = [
- ":calicoctl.bin",
+ # it's not worth the effort to bazelify all intermediary versions of calicoctl
+ # just to use them once, so until we finish upgrading use upstream binaries
+ "@calicoctl_3_15//file",
"//tools:secretstore",
"//tools/hscloud",
],
diff --git a/cluster/tools/calicoctl.sh b/cluster/tools/calicoctl.sh
index 86e1097..5f1390e 100755
--- a/cluster/tools/calicoctl.sh
+++ b/cluster/tools/calicoctl.sh
@@ -16,7 +16,7 @@
$(hscloud::must_rlocation hscloud/tools/secretstore) decrypt "$ws/cluster/secrets/cipher/etcd-calico.key" "$ETCD_KEY_FILE"
fi
- "$(hscloud::must_rlocation hscloud/cluster/tools/calicoctl.bin)" "$@"
+ "$(hscloud::must_rlocation calicoctl_3_15/file/calicoctl)" "$@"
}
main "$@"