From f61460cae11f6859b857c354171c9af9d38cbb67 Mon Sep 17 00:00:00 2001
From: Stephen Wong <stephen.kf.wong@gmail.com>
Date: Wed, 24 Apr 2019 07:11:22 +0000
Subject: Moving Clovisor dependent services into clovisor namespace

Change-Id: I6fde9161896115b5acd460cd7457df1a59ee1f6e
Signed-off-by: Stephen Wong <stephen.kf.wong@gmail.com>
---
 clover/clovisor/bin/clovisor                       | Bin 46391480 -> 46391472 bytes
 clover/clovisor/libclovisor/clovisor_bcc.go        |   3 +++
 clover/clovisor/libclovisor/clovisor_cfg.go        |  14 +++++++++++---
 clover/clovisor/libclovisor/clovisor_k8s.go        |   8 --------
 .../libclovisor/jaeger-all-in-one-template.yml     |  10 +++++-----
 clover/clovisor/libclovisor/redis.yaml             |   8 ++++----
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/clover/clovisor/bin/clovisor b/clover/clovisor/bin/clovisor
index a683ee6..9d05b48 100755
Binary files a/clover/clovisor/bin/clovisor and b/clover/clovisor/bin/clovisor differ
diff --git a/clover/clovisor/libclovisor/clovisor_bcc.go b/clover/clovisor/libclovisor/clovisor_bcc.go
index a6c74ef..8f9a7bf 100644
--- a/clover/clovisor/libclovisor/clovisor_bcc.go
+++ b/clover/clovisor/libclovisor/clovisor_bcc.go
@@ -666,6 +666,9 @@ func setupNodeIntf(ifindex int) (*nodeIntf, error) {
         return nil, err
     }
 
+    ip_track_table.DeleteAll()
+    node_sess_table.DeleteAll()
+
     return &nodeIntf{
         bpfMod:         bpf_mod,
         ipTrackTable:   ip_track_table,
diff --git a/clover/clovisor/libclovisor/clovisor_cfg.go b/clover/clovisor/libclovisor/clovisor_cfg.go
index 9c552da..ca3200e 100644
--- a/clover/clovisor/libclovisor/clovisor_cfg.go
+++ b/clover/clovisor/libclovisor/clovisor_cfg.go
@@ -22,9 +22,9 @@ import (
     jaeger_config "github.com/uber/jaeger-client-go/config"
 )
 
-var redisServer string = "redis.clover-system"
-var jaegerCollector string = "jaeger-collector.clover-system:14268"
-var jaegerAgent string = "jaeger-agent.clover-system:6831"
+var redisServer string = "redis.clovisor"
+var jaegerCollector string = "jaeger-collector.clovisor:14268"
+var jaegerAgent string = "jaeger-agent.clovisor:6831"
 var ProtoCfg string = "clovisor_proto_cfg"
 var protoPluginCfgChan string = "clovisor_proto_plugin_cfg_chan"
 
@@ -52,6 +52,14 @@ func get_cfg_labels(node_name string) ([]string, error) {
     return labels_list, err
 }
 
+func parse_label_cfg(label_cfg string) (string, string, string) {
+    label_slice := strings.Split(label_cfg, ":")
+    if len(label_slice) == 1 {
+        return label_slice[0], "", ""
+    }
+    return label_slice[0], label_slice[1], label_slice[2]
+}
+
 func get_egress_match_list(pod_name string) ([]egress_match_t) {
     client := redisConnect()
     defer client.Close()
diff --git a/clover/clovisor/libclovisor/clovisor_k8s.go b/clover/clovisor/libclovisor/clovisor_k8s.go
index 9587437..a53e308 100644
--- a/clover/clovisor/libclovisor/clovisor_k8s.go
+++ b/clover/clovisor/libclovisor/clovisor_k8s.go
@@ -60,14 +60,6 @@ func K8s_client_init(nodeName string) (*ClovisorK8s, error) {
     }, nil
 }
 
-func parse_label_cfg(label_cfg string) (string, string, string) {
-    label_slice := strings.Split(label_cfg, ":")
-    if len(label_slice) == 1 {
-        return label_slice[0], "", ""
-    }
-    return label_slice[0], label_slice[1], label_slice[2]
-}
-
 func (client *ClovisorK8s) Get_monitoring_info(nodeName string) (map[string]*monitoring_info_t,
                                                error) {
 
diff --git a/clover/clovisor/libclovisor/jaeger-all-in-one-template.yml b/clover/clovisor/libclovisor/jaeger-all-in-one-template.yml
index 0ae3870..1260ef5 100644
--- a/clover/clovisor/libclovisor/jaeger-all-in-one-template.yml
+++ b/clover/clovisor/libclovisor/jaeger-all-in-one-template.yml
@@ -19,7 +19,7 @@ items:
   kind: Deployment
   metadata:
     name: jaeger-deployment
-    namespace: clover-system
+    namespace: clovisor
     labels:
       app: jaeger
       jaeger-infra: jaeger-deployment
@@ -64,7 +64,7 @@ items:
   kind: Service
   metadata:
     name: jaeger-query
-    namespace: clover-system
+    namespace: clovisor
     labels:
       app: jaeger
       jaeger-infra: jaeger-service
@@ -81,7 +81,7 @@ items:
   kind: Service
   metadata:
     name: jaeger-collector
-    namespace: clover-system
+    namespace: clovisor
     labels:
       app: jaeger
       jaeger-infra: collector-service
@@ -106,7 +106,7 @@ items:
   kind: Service
   metadata:
     name: jaeger-agent
-    namespace: clover-system
+    namespace: clovisor
     labels:
       app: jaeger
       jaeger-infra: agent-service
@@ -135,7 +135,7 @@ items:
   kind: Service
   metadata:
     name: zipkin
-    namespace: clover-system
+    namespace: clovisor
     labels:
       app: jaeger
       jaeger-infra: zipkin-service
diff --git a/clover/clovisor/libclovisor/redis.yaml b/clover/clovisor/libclovisor/redis.yaml
index 8f99326..43204ff 100644
--- a/clover/clovisor/libclovisor/redis.yaml
+++ b/clover/clovisor/libclovisor/redis.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: clover-system
+  name: clovisor
   labels:
-    name: clover-system
+    name: clovisor
 ---
 apiVersion: v1
 kind: Pod
@@ -13,7 +13,7 @@ metadata:
     redis-sentinel: "true"
     role: master
   name: redis
-  namespace: clover-system
+  namespace: clovisor
 spec:
   containers:
     - name: redis
@@ -44,7 +44,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: redis
-  namespace: clover-system
+  namespace: clovisor
 spec:
   ports:
   - port: 6379
-- 
cgit 1.2.3-korg