VOL-570 : Change network type used by voltha components
- Updated from weave to calico which is the default network type
- Updated ponsim README file
- Removed deprecated data folder
Amendments:
- Change to specific version of kafka/zookeeper
- Added annotations statement to netconf manifest
Change-Id: Ibc8c06f037c275717b5c79b60443b7fd11545405
diff --git a/k8s/single-node/consul.yml b/k8s/single-node/consul.yml
index ec980e8..c07f4dc 100644
--- a/k8s/single-node/consul.yml
+++ b/k8s/single-node/consul.yml
@@ -56,7 +56,7 @@
labels:
app: consul
annotations:
- cni: "weave"
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 10
containers:
diff --git a/k8s/single-node/fluentd.yml b/k8s/single-node/fluentd.yml
index 8a9c4df..4204787 100644
--- a/k8s/single-node/fluentd.yml
+++ b/k8s/single-node/fluentd.yml
@@ -24,7 +24,7 @@
labels:
app: fluentd
annotations:
- cni: "weave"
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 10
containers:
diff --git a/k8s/single-node/kafka.yml b/k8s/single-node/kafka.yml
index 2d11968..c11e3dc 100644
--- a/k8s/single-node/kafka.yml
+++ b/k8s/single-node/kafka.yml
@@ -28,7 +28,7 @@
labels:
app: kafka
annotations:
- cni: "weave"
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 10
containers:
diff --git a/k8s/single-node/netconf.yml b/k8s/single-node/netconf.yml
index 19c188a..1487dc9 100644
--- a/k8s/single-node/netconf.yml
+++ b/k8s/single-node/netconf.yml
@@ -22,6 +22,8 @@
metadata:
labels:
app: netconf
+ annotations:
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 10
containers:
diff --git a/k8s/single-node/ofagent.yml b/k8s/single-node/ofagent.yml
index fc3b45f..ac82f2a 100644
--- a/k8s/single-node/ofagent.yml
+++ b/k8s/single-node/ofagent.yml
@@ -10,7 +10,7 @@
labels:
app: ofagent
annotations:
- cni: "weave"
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 10
containers:
diff --git a/k8s/single-node/vcli.yml b/k8s/single-node/vcli.yml
index 848bd3a..2784a96 100644
--- a/k8s/single-node/vcli.yml
+++ b/k8s/single-node/vcli.yml
@@ -25,7 +25,7 @@
labels:
app: vcli
annotations:
- cni: "weave"
+ cni: "calico"
spec:
containers:
- name: vcli
diff --git a/k8s/single-node/vcore_for_consul.yml b/k8s/single-node/vcore_for_consul.yml
index 7494740..6d5c672 100644
--- a/k8s/single-node/vcore_for_consul.yml
+++ b/k8s/single-node/vcore_for_consul.yml
@@ -32,7 +32,7 @@
labels:
app: vcore
annotations:
- cni: "weave"
+ cni: "calico"
spec:
containers:
- name: voltha
diff --git a/k8s/single-node/vcore_for_etcd.yml b/k8s/single-node/vcore_for_etcd.yml
index 4e306cb..ff579dc 100644
--- a/k8s/single-node/vcore_for_etcd.yml
+++ b/k8s/single-node/vcore_for_etcd.yml
@@ -32,7 +32,7 @@
labels:
app: vcore
annotations:
- cni: "weave"
+ cni: "calico"
spec:
containers:
- name: voltha
diff --git a/k8s/single-node/zookeeper.yml b/k8s/single-node/zookeeper.yml
index 9ced14a..d28aa39 100644
--- a/k8s/single-node/zookeeper.yml
+++ b/k8s/single-node/zookeeper.yml
@@ -34,7 +34,7 @@
labels:
app: zookeeper
annotations:
- cni: "weave"
+ cni: "calico"
spec:
containers:
- name: zoo