From 6de46d5277bf4aec4064611922a0a13d66b4b494 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 19 May 2023 16:36:09 +0800
Subject: [PATCH] =?UTF-8?q?feature:1.=E4=BF=AE=E6=94=B9=E8=87=AA=E6=A3=80p?=
 =?UTF-8?q?od=E7=9A=84namespace=E4=B8=BAtsg-os-system=202.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9reloader=E5=AE=B9=E5=99=A8=E5=90=8D=E5=AD=97=E4=B8=BAc?=
 =?UTF-8?q?onfig-reloader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roles/traffic-engine/files/reloader/reloader-crd.yaml  | 2 +-
 ansible/roles/tsg-diagnose/files/dign-client.yaml          | 2 ++
 ansible/roles/tsg-diagnose/files/dign-server.yaml          | 2 ++
 ansible/roles/tsg-diagnose/tasks/main.yml                  | 7 +++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/traffic-engine/files/reloader/reloader-crd.yaml b/ansible/roles/traffic-engine/files/reloader/reloader-crd.yaml
index 9e688e70..a5724cb6 100644
--- a/ansible/roles/traffic-engine/files/reloader/reloader-crd.yaml
+++ b/ansible/roles/traffic-engine/files/reloader/reloader-crd.yaml
@@ -10,4 +10,4 @@ spec:
     reloader:
       image:
         pullPolicy: Never
-    fullnameOverride: tsg-reloader
+    fullnameOverride: configmap-reloader
diff --git a/ansible/roles/tsg-diagnose/files/dign-client.yaml b/ansible/roles/tsg-diagnose/files/dign-client.yaml
index 531a942b..fd6f4a37 100644
--- a/ansible/roles/tsg-diagnose/files/dign-client.yaml
+++ b/ansible/roles/tsg-diagnose/files/dign-client.yaml
@@ -2,6 +2,7 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
+  namespace: tsg-os-system
   name: br-dign-client
 spec:
   config: '{
@@ -24,6 +25,7 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  namespace: tsg-os-system
   name: dign-client
   labels:
     app: dign-client
diff --git a/ansible/roles/tsg-diagnose/files/dign-server.yaml b/ansible/roles/tsg-diagnose/files/dign-server.yaml
index 60de4183..f65d1d68 100644
--- a/ansible/roles/tsg-diagnose/files/dign-server.yaml
+++ b/ansible/roles/tsg-diagnose/files/dign-server.yaml
@@ -2,6 +2,7 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
+  namespace: tsg-os-system
   name: br-dign-server
 spec:
   config: '{
@@ -24,6 +25,7 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  namespace: tsg-os-system
   name: dign-server
   labels:
     app: dign-server
diff --git a/ansible/roles/tsg-diagnose/tasks/main.yml b/ansible/roles/tsg-diagnose/tasks/main.yml
index 19b1819a..d4d1ca76 100644
--- a/ansible/roles/tsg-diagnose/tasks/main.yml
+++ b/ansible/roles/tsg-diagnose/tasks/main.yml
@@ -79,3 +79,10 @@
     dest: /etc/NetworkManager/dispatcher.d/
     mode: 0755
   when: runtime_env == 'TSG-X-P0906'
+
+- name: "modify k3s command"
+  shell: sed -i 's/kubectl exec -it daemonset\/dign-client/kubectl exec -n tsg-os-system -it daemonset\/dign-client/g' {{ item }}
+  with_items:
+    - /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-oneshot
+    - /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-periodical
+  when: runtime_env == 'TSG-X-P0906'