update sources of k8s and calico installation
move basic k8s setup to common
copy cni from hyperkube
configurable calico node image
use calico/cni image for obtaining cnis
use calico/ctl image for obtaining calicoctl binary
add cross requirement for k8s services and hyperkube
update metadata for new pillar model
update manifests to use hyperkube from common
Change-Id: I6e5e84cf252399120141ad941ac7aa6dae7c16ac
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index f951eb3..af37946 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -2,6 +2,8 @@
common:
network:
engine: none
+ hyperkube:
+ image: hyperkube-amd64:v1.5.0-beta.3-1
master:
addons:
dns: