Update Calico to v3.1.3
PROD-21420
Change-Id: I55fc09ec8bf8357075d3fb020db804d57065c687
diff --git a/tests/pillar/common_storageclass.sls b/tests/pillar/common_storageclass.sls
index 11bae00..5cb7e30 100644
--- a/tests/pillar/common_storageclass.sls
+++ b/tests/pillar/common_storageclass.sls
@@ -19,6 +19,8 @@
enabled: true
calicoctl_image: calico/ctl
cni_image: calico/cni
+ image: calico/node
+ kube_controllers_image: calico/kube-controllers
etcd:
members:
- host: 127.0.0.1
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 1093758..a61ce7e 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -30,10 +30,6 @@
server_image: image
agent_image: image
agent_probeurls: "http://ipinfo.io"
- calico_policy:
- enabled: true
- namespace: kube-system
- image: image
virtlet:
enabled: true
namespace: kube-system
@@ -69,6 +65,8 @@
enabled: true
calicoctl_image: calico/ctl
cni_image: calico/cni
+ image: calico/node
+ kube_controllers_image: calico/kube-controllers
etcd:
members:
- host: 127.0.0.1
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 8affa7d..d506d2f 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -30,10 +30,6 @@
server_image: image
agent_image: image
agent_probeurls: "http://ipinfo.io"
- calico_policy:
- enabled: true
- namespace: kube-system
- image: image
virtlet:
enabled: true
namespace: kube-system
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index 4b7bb31..60b6cb0 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -30,10 +30,6 @@
server_image: image
agent_image: image
agent_probeurls: "http://ipinfo.io"
- calico_policy:
- enabled: true
- namespace: kube-system
- image: image
virtlet:
enabled: true
namespace: kube-system
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 1b7d364..5f34de4 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -49,6 +49,8 @@
enabled: true
calicoctl_image: calico/ctl
cni_image: calico/cni
+ image: calico/node
+ kube_controllers_image: calico/kube-controllers
etcd:
members:
- host: 127.0.0.1
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index 276c80f..4bfc733 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -50,6 +50,8 @@
enabled: true
calicoctl_image: calico/ctl
cni_image: calico/cni
+ image: calico/node
+ kube_controllers_image: calico/kube-controllers
etcd:
members:
- host: 127.0.0.1