Refactor k8s network section definitions. Calico part
In this patch all calico related parameters are moved to
'network.calico' subsection.
Also added small fixes for deployment.
Change-Id: I32882487455f47c84a87511e384be32e9ed42622
diff --git a/tests/pillar/common_storageclass.sls b/tests/pillar/common_storageclass.sls
index 6050fe9..fbe6562 100644
--- a/tests/pillar/common_storageclass.sls
+++ b/tests/pillar/common_storageclass.sls
@@ -16,17 +16,17 @@
enabled: true
network:
engine: calico
- hash: fb5e30ebe6154911a66ec3fb5f1195b2
- private_ip_range: 10.150.0.0/16
- version: v0.19.0
- etcd:
- members:
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
+ calico:
+ calicoctl_image: calico/ctl
+ cni_image: calico/cni
+ etcd:
+ members:
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
service_addresses: 10.254.0.0/16
storage:
engine: glusterfs
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index a0c2a2c..e734b66 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -71,17 +71,17 @@
allow_privileged: true
network:
engine: calico
- hash: 9D8F997FEE542420B15986FEA0EDF253
- private_ip_range: 10.150.0.0/16
- version: v1.6.3
- etcd:
- members:
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
+ calico:
+ calicoctl_image: calico/ctl
+ cni_image: calico/cni
+ etcd:
+ members:
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
service_addresses: 10.254.0.0/16
storage:
engine: glusterfs
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 1dc2f0b..677d7b2 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -50,21 +50,15 @@
kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
ca: kubernetes
network:
- calicoctl:
- image: calico/ctl
- cni:
- image: calico/cni
engine: calico
- hash: c15ae251b633109e63bf128c2fbbc34a
- ipam:
- hash: 6e6d7fac0567a8d90a334dcbfd019a99
- version: v1.3.1
- version: v0.20.0
- etcd:
- members:
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
+ calico:
+ calicoctl_image: calico/ctl
+ cni_image: calico/cni
+ etcd:
+ members:
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index f756dd4..dba2f0b 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -51,21 +51,15 @@
kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
ca: kubernetes
network:
- calicoctl:
- image: calico/ctl
- cni:
- image: calico/cni
engine: calico
- hash: c15ae251b633109e63bf128c2fbbc34a
- ipam:
- hash: 6e6d7fac0567a8d90a334dcbfd019a99
- version: v1.3.1
- version: v0.20.0
- etcd:
- members:
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
- - host: 127.0.0.1
- port: 4001
+ calico:
+ calicoctl_image: calico/ctl
+ cni_image: calico/cni
+ etcd:
+ members:
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001
+ - host: 127.0.0.1
+ port: 4001