Switch calico source to binary instead of docker image.
Since docker going to be removed from k8s formula,
calico should be downloaded as raw binary.
Related story: PROD-23498
Change-Id: I8634efacabdfa6862878d96770cdbc3628b5e465
diff --git a/tests/pillar/common_storageclass.sls b/tests/pillar/common_storageclass.sls
index 7d6e97d..91e6b04 100644
--- a/tests/pillar/common_storageclass.sls
+++ b/tests/pillar/common_storageclass.sls
@@ -23,8 +23,8 @@
network:
calico:
enabled: true
- calicoctl_image: calico/ctl
- cni_image: calico/cni
+ calicoctl_source: calico/ctl
+ calicoctl_source_hash: d41d8cd98f00b204e9800998ecf8427e
image: calico/node
kube_controllers_image: calico/kube-controllers
etcd:
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index b7b21d3..6a6a85c 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -64,8 +64,8 @@
network:
calico:
enabled: true
- calicoctl_image: calico/ctl
- cni_image: calico/cni
+ calicoctl_source: calico/ctl
+ calicoctl_source_hash: d41d8cd98f00b204e9800998ecf8427e
image: calico/node
kube_controllers_image: calico/kube-controllers
etcd:
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 3a0eded..6a3e05d 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -48,8 +48,14 @@
network:
calico:
enabled: true
- calicoctl_image: calico/ctl
- cni_image: calico/cni
+ calicoctl_source: calico/ctl
+ calicoctl_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ birdcl_source: calico/birdcl
+ birdcl_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ cni_source: calico/cni
+ cni_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ cni_ipam_source: calico/cni-ipam
+ cni_ipam_source_hash: d41d8cd98f00b204e9800998ecf8427e
image: calico/node
kube_controllers_image: calico/kube-controllers
etcd:
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index 018aec3..3567b40 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -49,8 +49,14 @@
network:
calico:
enabled: true
- calicoctl_image: calico/ctl
- cni_image: calico/cni
+ calicoctl_source: calico/ctl
+ calicoctl_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ birdcl_source: calico/birdcl
+ birdcl_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ cni_source: calico/cni
+ cni_source_hash: d41d8cd98f00b204e9800998ecf8427e
+ cni_ipam_source: calico/cni-ipam
+ cni_ipam_source_hash: d41d8cd98f00b204e9800998ecf8427e
image: calico/node
kube_controllers_image: calico/kube-controllers
etcd: