From a63dfb66e8aba324665c9b092e1726201c301d94 Mon Sep 17 00:00:00 2001
From: Zhe Huang <zhehuang@research.att.com>
Date: Tue, 23 Jul 2019 16:32:39 -0400
Subject: [PATCH] Add e2 pre  privilegedmode: true

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I1a59ee7a5a49e49b1a6aa56559f3fd6a3f447588
---
 RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE                         | 3 +++
 ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml  | 2 +-
 ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml                | 3 ++-
 ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml | 4 ++--
 ric-platform/50-RIC-Platform/helm/e2term/values.yaml               | 4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index 483e7364..cf40fa51 100644
--- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@ -99,6 +99,7 @@ e2mgr:
     tag: 1.6.0
   env:
     RIC_ID: "bbbccc-abcd0e/20"
+  privilegedmode: true
 
 
 # E2 Termination
@@ -110,6 +111,8 @@ e2term:
     tag: 1.6.0
   env:
     print: "1"
+  privilegedmode: true
+  hostnetworkmode: true
 
 # Routing Manager
 rtmgr:
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
index c10fa6b7..fb27c755 100644
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
@@ -65,7 +65,7 @@ spec:
           stdin: true
           tty: true
           securityContext:
-            privileged: true
+            privileged: {{ .Values.e2mgr.privilegedmode}}
       volumes:
         - name: local-router-file
           configMap:
diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml
index f6ee2dd3..ed90d34f 100644
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml
@@ -40,7 +40,8 @@ e2mgr:
   image:
     name: e2mgr
     tag: 1.6.0 
-  
+
+  privilegedmode: false
   
   replicaCount: 1
   
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
index ed80b846..03d66035 100644
--- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostname: {{ include "common.name.e2term" . }}
-      hostNetwork: true
+      hostNetwork: {{ .Values.e2term.hostnetworkmode }}
       dnsPolicy: ClusterFirstWithHostNet
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
@@ -65,7 +65,7 @@ spec:
           stdin: true
           tty: true
           securityContext:
-            privileged: true
+            privileged: {{ .Values.e2term.privilegedmode }}
       volumes:
         - name: local-router-file
           configMap:
diff --git a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml
index a4d72fcc..f58b1107 100644
--- a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml
@@ -38,7 +38,9 @@ e2term:
     name: e2
     tag: 1.6.0
   
-  
+  privilegedmode: true
+  hostnetworkmode: true
+
   replicaCount: 1
   env:
     print: "1"
-- 
2.16.6