commit 2d4e07fe6962dc00f3f1c913156ec765d7fff2ef
author Stephane Barbarie <sbarbari@ciena.com> Mon Mar 26 16:46:45 2018 -0400
committer khenaidoo Nursimulu <knursimu@ciena.com> Wed Mar 28 20:16:13 2018 +0000
tree 1b7dabbc91d7ed547bcfb20104ab41826996f89b
parent e84aca910e5ffd60c9e1ed6aa231be5a62be15a0

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

k8s/ingress/10-default-backend.yml

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: