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/ingress/10-default-backend.yml b/k8s/ingress/10-default-backend.yml
index 38987aa..f1e33f6 100644
--- a/k8s/ingress/10-default-backend.yml
+++ b/k8s/ingress/10-default-backend.yml
@@ -11,6 +11,8 @@
metadata:
labels:
app: default-http-backend
+ annotations:
+ cni: "calico"
spec:
terminationGracePeriodSeconds: 60
containers:
diff --git a/k8s/ingress/60-cluster-ingress-nginx.yml b/k8s/ingress/60-cluster-ingress-nginx.yml
index 5b86979..05b720b 100644
--- a/k8s/ingress/60-cluster-ingress-nginx.yml
+++ b/k8s/ingress/60-cluster-ingress-nginx.yml
@@ -13,6 +13,7 @@
labels:
app: ingress-nginx
annotations:
+ cni: "calico"
prometheus.io/port: '10254'
prometheus.io/scrape: 'true'
spec: