From 559fe0f69e2ba9ef74cae8267a00be0291fdb9e9 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Wed, 29 Mar 2023 14:27:07 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BAsha?=
 =?UTF-8?q?ping=E5=AE=B9=E5=99=A8=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/HAL_deploy.yml                                    | 2 +-
 ansible/install_config/group_vars/rpm_version.yml         | 1 +
 ansible/roles/traffic-engine/files/helm/conf/conflist.inf | 3 ---
 .../roles/traffic-engine/files/helm/templates/_config.tpl | 4 ++--
 .../traffic-engine/files/helm/templates/shaping.yaml      | 3 ++-
 .../files/helm/templates/traffic-engine.yaml              | 8 ++++++++
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ansible/HAL_deploy.yml b/ansible/HAL_deploy.yml
index de06e390..94c1af37 100644
--- a/ansible/HAL_deploy.yml
+++ b/ansible/HAL_deploy.yml
@@ -252,7 +252,7 @@
     - {role: framework, tags: framework}
     - {role: bfdd, tags: bfdd}
 
-- hosts: TSG-X-NXR620G40-R01-P0906-shaping-engine
+- hosts: TSG-X-NXR620G40-R01-P0906-shaping
   remote_user: root
   vars_files:
     - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 220d7cf8..168e4fc8 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -51,6 +51,7 @@ framework_rpm_version:
   17_libmaatframe_tools: libmaatframe-tools-3.6.19.9c4741d
   18_libswarmkv: libswarmkv-3.0.3.7614cf8
   19_libswarmkv-tools: libswarmkv-tools-3.0.3.7614cf8
+  20_libfieldstat3: libfieldstat3-3.0.1.1e22236
 
 kni_rpm_version:
   kni: kni-5.0.2.6cb27c3
diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
index 4b3528d7..ec3a1ac2 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
+++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
@@ -14,9 +14,6 @@
 {{- if eq .Values.ddos_event.enable .Values.define_enable_val_yes }}
 ./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf
 {{- end }}
-{{- if eq .Values.shaping.enable .Values.define_enable_val_yes }}
-./plug/platform/shaping_master/shaping_master.inf
-{{- end }}
 
 [protocol]
 {{- if eq .Values.decoders.SOCKS .Values.define_enable_val_yes }}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
index f8f4d591..9d86c313 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
+++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
@@ -250,8 +250,8 @@ enable_breakpad_upload=0
             export TOKEN=$(cat ${SERVICEACCOUNT}/token)
             export CACERT=${SERVICEACCOUNT}/ca.crt
             curl --cacert ${CACERT} --header "Authorization: Bearer ${TOKEN}" -X GET ${APISERVER}/api/v1/namespaces/${NAMESPACE}/services/${SERVICENAME} -o /tmp/service.txt
-            export CLUSTER_ANNOUNCE_PORT=$(cat /tmp/service.txt | jq '.spec.ports[] | select(.name=="shaping-cluster-announce-port") | .nodePort')
-            export HEALTH_CHECK_ANNOUNCE_PORT=$(cat /tmp/service.txt | jq '.spec.ports[] | select(.name=="shaping-healthcheck-announce-port") | .nodePort')
+            export CLUSTER_ANNOUNCE_PORT=$(cat /tmp/service.txt | jq '.spec.ports[] | select(.name=="cluster-announce-port") | .nodePort')
+            export HEALTH_CHECK_ANNOUNCE_PORT=$(cat /tmp/service.txt | jq '.spec.ports[] | select(.name=="healthcheck-announce-port") | .nodePort')
             echo "export CLUSTER_ANNOUNCE_PORT=${CLUSTER_ANNOUNCE_PORT}" > /etc/profile.d/announceinfo.sh
             echo "export HEALTH_CHECK_ANNOUNCE_PORT=${HEALTH_CHECK_ANNOUNCE_PORT}" >> /etc/profile.d/announceinfo.sh
             chmod 0755 /etc/profile.d/announceinfo.sh
diff --git a/ansible/roles/traffic-engine/files/helm/templates/shaping.yaml b/ansible/roles/traffic-engine/files/helm/templates/shaping.yaml
index 4dc5e58e..87dc37fd 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/shaping.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/shaping.yaml
@@ -4,4 +4,5 @@ metadata:
   name: shaping-{{ .Release.Name }}
   namespace: default
 data:
-  shaping.conf: {{ tpl (.Files.Get "conf/shaping.conf") . | quote }}
\ No newline at end of file
+  shaping.conf: {{ tpl (.Files.Get "conf/shaping.conf") . | quote }}
+  tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}
\ No newline at end of file
diff --git a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
index 360b188e..2970c93f 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
@@ -236,6 +236,14 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.hostIP
+        - name: MRZCPD_CTRLMSG_LISTEN_ADDR
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        - name: OVERRIDE_SLED_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
         livenessProbe:
           tcpSocket:
             port: 8551