From a35400365e2e86dbe5a1bb1862c377ca394116a7 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Tue, 9 May 2023 15:12:47 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E5=9B=A0=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E9=A9=B1=E5=8A=A8=E7=9A=84=E5=BA=93=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/traffic-engine/files/helm/conf/tfe.conf         | 4 ++--
 ansible/roles/traffic-engine/files/helm/templates/_config.tpl | 3 ---
 .../files/helm/templates/deployment-firewall.yaml             | 1 +
 .../traffic-engine/files/helm/templates/deployment-proxy.yaml | 1 +
 .../files/helm/templates/deployment-service-chaining.yaml     | 1 +
 .../files/helm/templates/deployment-shaping.yaml              | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
index ed508d0d..b8f363dc 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
@@ -35,12 +35,12 @@ queue_no_enobufs=1
 #scm_socket_file=/var/run/.tfe_kmod_scm_socket
 
 # send cmsg
-send_switch=1
+send_switch=0
 ip=127.0.0.1
 cmsg_port=2475
 
 # watch dog
-watchdog_switch=1
+watchdog_switch=0
 watchdog_port=2476
 
 [watchdog_tfe]
diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
index c6ee162b..063fd539 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
+++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
@@ -132,9 +132,6 @@ enable_breakpad_upload=0
             cp /opt/tsg/config/main.conf               /opt/tsg/sapp/tsgconf/main.conf
             cp /opt/tsg/config/maat.conf               /opt/tsg/sapp/tsgconf/maat.conf
             cp /opt/tsg/config/sapp.toml               /opt/tsg/sapp/etc/sapp.toml
-{{- if eq .Values.proxy.enable .Values.define_enable_val_yes }}
-            cp /opt/tsg/config/kni.conf                /opt/tsg/sapp/etc/kni/kni.conf
-{{- end }}
             cp /opt/tsg/config/wangw.conf              /opt/tsg/sapp/etc/wannat/wangw.conf
             cp /opt/tsg/config/wire_graft.conf         /opt/tsg/sapp/etc/wire_graft/wire_graft.conf
             cp /opt/tsg/config/tsg_conn_sketch.inf     /opt/tsg/sapp/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
index f7f4c94d..801bdb7b 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
@@ -42,6 +42,7 @@ spec:
           - "bash"
           - "-ec"
           - |
+            ldconfig
             {{ template "traffic-engine.firewall.copy-config-to-dest" . }}
             {{ template "traffic-engine.firewall.prestart" . }}
             {{ template "traffic-engine.firewall.start" . }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
index d1ea6e2a..f2222f1a 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
@@ -43,6 +43,7 @@ spec:
           - "bash"
           - "-ec"
           - |
+            ldconfig
             {{ template "traffic-engine.proxy.copy-config-to-dest" . }}
             {{ template "traffic-engine.proxy.prestart" . }}
             {{ template "traffic-engine.proxy.start" . }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
index 6d62b4bb..c83de760 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
@@ -61,6 +61,7 @@ spec:
           - "bash"
           - "-ec"
           - |
+            ldconfig
             {{ template "traffic-engine.sce.copy-config-to-dest" . }}
             {{ template "traffic-engine.service-chaining.prestart" . }}
             {{ template "traffic-engine.service-chaining.start" . }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
index 3f8d4029..696545f7 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
@@ -43,6 +43,7 @@ spec:
           - "bash"
           - "-ec"
           - |
+            ldconfig
             {{ template "traffic-engine.shaping.copy-config-to-dest" . }}
             {{ template "traffic-engine.shaping.get-service-node-port" . }}
             {{ template "traffic-engine.shaping.set-shaping-config" . }}