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
Change-Id: Ie8d6a858a8898861aa8739b62130af971728f272
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index f639738..71dda18 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -2,6 +2,8 @@
common:
network:
engine: none
+ hyperkube:
+ image: hyperkube-amd64:v1.5.0-beta.3-1
pool:
enabled: true
version: v1.2.0
@@ -27,9 +29,10 @@
kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
ca: kubernetes
network:
+ calicoctl:
+ image: calico/ctl
cni:
- hash: 06550617ec199e89a57c94c88c891422
- version: v1.3.1
+ image: calico/cni
engine: calico
hash: c15ae251b633109e63bf128c2fbbc34a
ipam:
@@ -46,6 +49,3 @@
port: 4001
hyperkube:
hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
- cni:
- version: v0.3.0
- hash: 58237532e1b2b1be1fb3d12457da85f5
\ No newline at end of file