bugfix:修改helm相关配置项名称,增加清理traffic-engine日志相关配置文件

2022-08-26 18:00:02 +08:00
parent 4d8bdd9ddf
commit 11a39bba20
21 changed files with 65 additions and 52 deletions
--- a/ansible/roles/certstore/tasks/main.yml
+++ b/ansible/roles/certstore/tasks/main.yml
@@ -93,7 +93,7 @@
    path: "/etc/cert-redis.conf"
    regexp: 'daemonize yes'
    replace: 'daemonize no'
-  when: runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-certstore' 
+  when: (runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-certstore') or (runtime_env == 'TSG-X-P1808' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-certstore') 

 - name: "copy zlog.conf to dest"
  copy:
--- a/ansible/roles/container-tools-install/tasks/main.yml
+++ b/ansible/roles/container-tools-install/tasks/main.yml
@@ -3,11 +3,11 @@
    name: ansible
    conf_file: "{{ rpm_repo_config_path }}"
    state: present
-  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init'
+  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' or PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'

 - name: "Generate ansiblg.cfg after ansible upgrade in rockylinux8"
  shell: ansible-config init --disabled > /etc/ansible/ansible.cfg
-  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init'
+  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' or PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'

 - name: 'change ansible hash_behaviour value replace to merge'
  lineinfile:
@@ -15,11 +15,11 @@
    backrefs: yes
    regexp: "^(.*hash_behaviour.*=.*replace.*)$"
    line: '\1\nhash_behaviour = merge'
-  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init'
+  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' or PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'

 - name: 'install psutil'
  shell: pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple psutil
-  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init'
+  when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' or PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'

 - name: "install tcpdump"
  yum:
--- a/ansible/roles/traffic-engine/files/helm/conf/gdev.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/gdev.conf
@@ -1,5 +1,5 @@
 [Module]
-pcapdevice={{ .Values.network_setting.nic_raw.name }}
-sendto_gdev_card={{ .Values.network_setting.nic_raw.name }}
+pcapdevice={{ .Values.nic_raw_name }}
+sendto_gdev_card={{ .Values.nic_raw_name }}
 sendto_gdev_ip={{ .Values.etherfabric_settings.keepalive.ip }}
 gdev_status_switch=1
--- a/ansible/roles/traffic-engine/files/helm/conf/kni.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/kni.conf
@@ -2,7 +2,7 @@
 log_path = ./log/kni/kni.log
 log_level = 30
 tfe_node_count = 1
-manage_eth = {{ .Values.network_setting.nic_policy_log.name }}
+manage_eth = {{ .Values.nic_policy_log_name }}
 # deploy_mode: normal/tap
 deploy_mode = tap
 src_mac_addr = 00:0e:c6:d6:72:c1
@@ -23,7 +23,7 @@ bpf_hash_mode=2

 tap_rps_enable=1
 # cat /sys/class/net/tap0/queues/rx-%{d}/rps_cpus
-tap_rps_mask="{{ .Values.tfe_env_rps_info.rps_mask }}"
+tap_rps_mask="{{ .Values.tfe_rps_mask }}"

 [io_uring]
 enable_iouring=1
--- a/ansible/roles/traffic-engine/files/helm/conf/main.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf
@@ -42,7 +42,7 @@ LOCATION_TABLE_TYPE=19
 MODE=1
 VSYSTEM_ID=1
 NAMESPACE_ID=1
-NIC_NAME="{{ .Values.network_setting.nic_policy_log.name }}"
+NIC_NAME="{{ .Values.nic_policy_log_name }}"
 MAX_SERVICE=1
 LOG_LEVEL=30
 LOG_PATH="./tsglog/tsglog"
@@ -66,7 +66,7 @@ OUTPUT_PATH="./tsg_stat.log"
 APP_NAME="tsg_master"

 [SYSTEM]
-NIC_NAME="{{ .Values.network_setting.nic_policy_log.name }}"
+NIC_NAME="{{ .Values.nic_policy_log_name }}"
 DATACENTER_ID={{ .Values.session_id_generator.snowflake_worker_id_base }}
 LOG_LEVEL=30
 LOG_PATH="./tsglog/tsg_master"
@@ -144,7 +144,7 @@ TRAFFIC_MIRROR_ENABLE=1
 {{- else }}
 TRAFFIC_MIRROR_ENABLE=0
 {{- end }}
-NIC_NAME={{ .Values.network_setting.nic_mirror.name }}
+NIC_NAME={{ .Values.nic_mirror_name }}
 DEFAULT_VLAN_ID=0
 [RADIUS_PLUG]
 DEVICE_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}
--- a/ansible/roles/traffic-engine/files/helm/conf/sapp.toml
+++ b/ansible/roles/traffic-engine/files/helm/conf/sapp.toml
@@ -6,7 +6,7 @@
 ###################################################################################################

 [SYSTEM]
-instance_name = "sapp4"
+instance_name = "sapp4-{{ .Release.Name }}"

 [CPU]
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
@@ -25,7 +25,7 @@ dictator_enable=0
    l2_l3_tunnel_support=1

 ### note, optional value is [none, vxlan]
-        overlay_mode=vxlan
+        overlay_mode=none
    [packet_io.feature]

    destroy_all_plug_enabled = 0	
@@ -67,7 +67,7 @@ dictator_enable=0
 ### note, interface.type options: [pag,pcap,marsio]
    [packet_io.internal.interface]
        type=marsio
-        name={{ .Values.network_setting.nic_raw.name }}
+        name={{ .Values.nic_raw_name }}
    [packet_io.external.interface]
        type=pcap
    name=lo
--- a/ansible/roles/traffic-engine/files/helm/conf/send_raw_pkt.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/send_raw_pkt.conf
@@ -2,8 +2,8 @@
 ##(11:ipfile, 12:marsio4, 13:agent_smith, 14:dpdk_vxlan, 15:marsio_vxlan, 16:pag_marsio

 #target_id
-0 	pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ .Values.network_setting.nic_raw.name }} smith dpdk dpdk pag
-1 	pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ .Values.network_setting.nic_raw.name }} smith dpdk dpdk pag
+0 	pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ .Values.nic_raw_name }} smith dpdk dpdk pag
+1 	pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ .Values.nic_raw_name }} smith dpdk dpdk pag
 #2 	pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p1 smith dpdk dpdk pag
 #3 	pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag
 #4 	pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag
--- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
@@ -96,7 +96,7 @@ key_log_file=log/sslkeylog.log

 # mid cert cache
 mc_cache_enable=1
-mc_cache_eth={{ .Values.network_setting.nic_policy_log.name }}
+mc_cache_eth={{ .Values.nic_policy_log_name }}
 mc_cache_broker_list={{- include "traffic-engine.config.olap-address" (list .  ",") }}
 mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
 sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }}
@@ -162,7 +162,7 @@ enable=1
 {{- else }}
 enable=0
 {{- end }}
-device={{ .Values.network_setting.nic_mirror.name }}
+device={{ .Values.nic_mirror_name }}
 # 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO
 type=1

@@ -172,7 +172,7 @@ default_vlan_id=0

 [kafka]
 enable=1
-NIC_NAME={{ .Values.network_setting.nic_policy_log.name }}
+NIC_NAME={{ .Values.nic_policy_log_name }}
 kafka_brokerlist={{- include "traffic-engine.config.olap-address" (list .  ",") }}
 kafka_topic=PROXY-EVENT
 sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }}
--- a/ansible/roles/traffic-engine/files/helm/conf/vlan_flipping_map.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/vlan_flipping_map.conf
@@ -0,0 +1,11 @@
+#for inline a device vlan flipping 
+#数据包来自C路由器端, 即C2I(I2E)方向, 
+#数据包来自I路由器端, 即I2C(E2I)方向, 
+#平台会根据vlan_id,设置当前包route_dir的值, 以便上层业务插件做两个方向的流量统计,
+#如果一对vlan_id写反了, 网络是通的, 但是I2E,E2I的流量统计就颠倒了.
+#配置文件格式, pattern:
+#来自C路由器vlan_id	  	来自I路由器vlan_id   	是否开启mac地址翻转
+#C_router_vlan_id  I_router_vlan_id mac_flipping_enable
+1000	1001	0
+2000	2001	0
+4000	4001	0
--- a/ansible/roles/traffic-engine/files/helm/conf/wangw.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/wangw.conf
@@ -7,7 +7,7 @@ NAT_GW_tunnel_mode=vxlan
 #从起始位置开始, 本地监听sapp->threa_cound个端口, 支持多线程NIO无锁模式
 recvfrom_NATGW_bind_first_port={{ .Values.wannat.wan_gateway_listen_port_range_left_edge }}
 #NAT GW的内部互联网卡名称
-NAT_GW_tunnel_device={{ .Values.network_setting.nic_policy_log.name }}
+NAT_GW_tunnel_device={{ .Values.nic_policy_log_name }}

 #DNAT首包发送给NATGW时, 对端的监听端口
 NAT_GW_tunnel_port={{ .Values.external_resources.nat_gateway.data_listen_port }}
--- a/ansible/roles/traffic-engine/files/helm/conf/wire_graft.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/wire_graft.conf
@@ -16,7 +16,7 @@ at_least_total_byte=10
 stream_project_tag_enable=1

 #用于标识本机ip使用哪块网卡,可能是管理口,可能是其他业务口
-identification_by_which_device={{ .Values.network_setting.nic_policy_log.name }}
+identification_by_which_device={{ .Values.nic_policy_log_name }}

 #mirror镜像模式下, 从MAC地址获取链路信息
 ### note, for example, dst mac is 01:12:34:56:78:90, src src is 02:AA:BB:CC:DD:EE:FF, 
--- a/ansible/roles/traffic-engine/files/helm/templates/certstore.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/certstore.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: certstore
+  name: certstore-{{ .Release.Name }}
  namespace: default
 data:
  cert_store.ini: {{ tpl (.Files.Get "conf/cert_store.ini") . | quote }}
--- a/ansible/roles/traffic-engine/files/helm/templates/provision.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/provision.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: provisioninit
+  name: provisioninit-{{ .Release.Name }}
  namespace: default
 data:
  provision.yml: {{ tpl (.Files.Get "conf/provision.yml") . | quote }}
--- a/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/sapp.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: sapp
+  name: sapp-{{ .Release.Name }}
  namespace: default
 data:
  conflist.inf: {{ tpl (.Files.Get "conf/conflist.inf") . | quote }}
@@ -14,4 +14,4 @@ data:
  kni.conf: {{ tpl (.Files.Get "conf/kni.conf") . | quote }}
  wangw.conf: {{ tpl (.Files.Get "conf/wangw.conf") . | quote }}
  wire_graft.conf: {{ tpl (.Files.Get "conf/wire_graft.conf") . | quote }}
-
+  vlan_flipping_map.conf: {{ tpl (.Files.Get "conf/vlan_flipping_map.conf") . | quote }}
--- a/ansible/roles/traffic-engine/files/helm/templates/telegraf.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/telegraf.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: telegraf
+  name: telegraf-{{ .Release.Name }}
  namespace: default
 data:
  telegraf_statistic.conf: {{ tpl (.Files.Get "conf/telegraf_statistic.conf") . | quote }}
--- a/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/tfe.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: tfe
+  name: tfe-{{ .Release.Name }}
  namespace: default
 data:
  tfe.conf: {{ tpl (.Files.Get "conf/tfe.conf") . | quote }}
--- a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
@@ -83,6 +83,9 @@ spec:
        - name: sapp
          mountPath: "/opt/tsg/sapp/etc/wire_graft/wire_graft.conf"
          subPath: "wire_graft.conf"
+        - name: sapp
+          mountPath: "/opt/tsg/sapp/etc/vlan_flipping_map.conf"
+          subPath: "vlan_flipping_map.conf"
        - name: config-volume
          mountPath: "/opt/tsg/etc/tsg_sn.json"
          subPath: "opt/tsg/etc/tsg_sn.json"
@@ -96,7 +99,7 @@ spec:
        image: docker.io/library/tsg-proxy:{{ .Chart.AppVersion }}
        imagePullPolicy: Never
        workingDir: /opt/tsg/tfe
-        command: ["/bin/bash", "-c", "sleep 1;/opt/tsg/tfe/bin/tfe"]
+        command: ["/opt/tsg/tfe/bin/tfe"]
        securityContext:
          privileged: true
        livenessProbe:
@@ -202,19 +205,19 @@ spec:
          path: /root/sys
      - name: telegraf
        configMap:
-          name: telegraf
+          name: telegraf-{{ .Release.Name }}
      - name: certstore
        configMap:
-          name: certstore
+          name: certstore-{{ .Release.Name }}
      - name: tfe
        configMap:
-          name: tfe
+          name: tfe-{{ .Release.Name }}
      - name: sapp
        configMap:
-          name: sapp
+          name: sapp-{{ .Release.Name }}
      - name: provisioninit
        configMap:
-          name: provisioninit      
+          name: provisioninit-{{ .Release.Name }}
      - name: config-volume
        emptyDir: {}
      - name: firewall-minidump
@@ -228,10 +231,10 @@ spec:
          path: /run/certstore/crashreport
      - name: firewall-log
        hostPath: 
-          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/sapp/log
+          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/sapp/
      - name: proxy-log
        hostPath:
-          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/tfe/log
+          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/tfe/
      - name: certstore-log
        hostPath:
-          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/certstore/log
+          path: /var/log/traffic-engine/traffic-engine-{{ .Release.Name }}/certstore/
--- a/ansible/roles/traffic-engine/files/helm/values.yaml
+++ b/ansible/roles/traffic-engine/files/helm/values.yaml
@@ -120,25 +120,17 @@ etherfabric_settings:
    mask: 255.255.255.0

 sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76]
-mrzcpd_affinity: [1,2,3,4]
 tfe_affinity: [77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]

-tfe_env_rps_info:
-  rps_mask: "0,1fffe000,00000000,00000000"
+tfe_rps_mask: "00000000"

-network_setting:
-  nic_policy_log:
-    name: eth0
-  nic_raw:
-    name: ctrl_mock
-  nic_mirror:
-    name: eth0
+nic_policy_log_name: ctrl_mock
+nic_raw_name: eth0
+nic_mirror_name: eth0

-define_enable_val_yes:  yes
+define_enable_val_yes: yes
 define_enable_val_no: no

-
-
 coredump:
    format: "core"
    collect: "local"
--- a/ansible/roles/traffic-engine/files/tmpfiles.d/traffic-engine.conf
+++ b/ansible/roles/traffic-engine/files/tmpfiles.d/traffic-engine.conf
@@ -0,0 +1,2 @@
+#Type Path        Mode User Group Age Argument
+d /var/log/traffic-engine/  0755 - -  2d -
--- a/ansible/roles/traffic-engine/tasks/main.yml
+++ b/ansible/roles/traffic-engine/tasks/main.yml
@@ -34,3 +34,8 @@
    src: "{{ role_path }}/files/kubeconfig.sh"
    dest: /etc/profile.d/
    mode: 0755
+
+- name: "install tmpfiles.d for clean log"
+  copy:
+    src: "{{ role_path }}/files/tmpfiles.d/traffic-engine.conf"
+    dest: /usr/lib/tmpfiles.d/
--- a/ansible/roles/tsg-os-provision/tasks/main.yml
+++ b/ansible/roles/tsg-os-provision/tasks/main.yml
@@ -96,7 +96,7 @@
    src: "{{ role_path }}/files/tasks/provision.yml.TSGXNXR620G40R01P1808"
    dest: /opt/tsg/tsg-os-provision/tasks/provision.yml
    mode: 0644
-  when: runtime_env == 'TSG-X-P1808' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808' 
+  when: runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808' 

 - name: "tsg-os-provision: copy tasks file that excutes provision to dest - tsg-x p0906 init"
  copy:
@@ -110,7 +110,7 @@
    src: "{{ role_path }}/files/tasks/provision.yml.TSGXNXR620G40R01P1808-init"
    dest: /opt/tsg/tsg-os-provision/tasks/provision.yml
    mode: 0644
-  when: runtime_env == 'TSG-X-P1808' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'
+  when: runtime_env == 'TSG-X-P0906' and PROFILE_ID == 'TSG-X-NXR620G40-R01-P1808-init'

 - name: "tsg-os-provision: copy provision.yml.sample file to dest - tsg9140"
  copy: