feature:TSG-P0906环境删除kni安装

ansible/HAL_deploy.yml

@@ -188,7 +188,6 @@
     - {role: framework, tags: framework}
     - {role: sapp, tags: sapp}
     - {role: tsg_master, tags: tsg_master}
-    - {role: kni, tags: kni}
     - {role: firewall, tags: firewall}
     - {role: tsg_app, tags: tsg_app}
     - {role: wannat_wangw, tags: wannat_wangw}

ansible/roles/traffic-engine/files/helm/conf/conflist.inf

@@ -76,9 +76,6 @@
 {{- if eq .Values.packet_capture.enable .Values.define_enable_val_yes }}
 ./plug/business/capture_packet_plug/capture_packet_plug.inf
 {{- end }}
-{{- if and (eq .Values.proxy.enable .Values.define_enable_val_yes) (ge (len .Values.tfe_affinity) 1) }}
-./plug/business/kni/kni.inf
-{{- end }}
 {{- if eq .Values.firewall.enable .Values.define_enable_val_yes }}
 ./plug/business/firewall/firewall.inf
 {{- end }}

ansible/roles/traffic-engine/files/helm/conf/kni.conf

@@ -1,149 +0,0 @@
-[global]
-log_path = ./log/kni/kni.log
-log_level = 30
-tfe_node_count = 1
-manage_eth = eth0
-# deploy_mode: normal/tap
-deploy_mode = tap
-src_mac_addr = 00:0e:c6:d6:72:c1
-dst_mac_addr = fe:65:b7:03:50:bd
-
-[tap]
-tap_name= tap0
-
-# tap_allow_mutilthread=1     load bpf
-# tap_allow_mutilthread=0 not load bpf
-tap_allow_mutilthread=1
-bpf_obj=/opt/tsg/sapp/plug/business/kni/bpf_tun_rss_steering.o
-bpf_default_queue=-1
-# tap_bpf_debug_log: cat /sys/kernel/debug/tracing/trace_pipe
-bpf_debug_log=0
-# 2: BPF 使用二元组分流; 4: BPF 使用四元组分流
-bpf_hash_mode=2
-
-tap_rps_enable=1
-# cat /sys/class/net/tap0/queues/rx-%{d}/rps_cpus
-tap_rps_mask="{{ .Values.tfe_rps_mask }}"
-
-[io_uring]
-enable_iouring=1
-enable_debuglog=0
-ring_size=1024
-buff_size=2048
-flags=0
-sq_thread_idle=0
-
-[tfe0]
-enabled = 1
-dev_eth_symbol = tap0
-ip_addr = 127.0.0.1
-
-[tfe_cmsg_receiver]
-listen_eth = lo
-listen_port = 2475
-
-[watch_dog]
-switch = 1
-listen_eth = lo
-listen_port = 2476
-keepalive_idle = 2
-keepalive_intvl = 1
-keepalive_cnt = 3
-
-[marsio]
-appsym = knifw
-
-[dup_traffic]
-switch = 0
-action = 2
-capacity = 10000000
-error_rate = 0.00001
-expiry_time = 60
-
-[traceid2pme_htable]
-mho_screen_print_ctrl = 0
-mho_thread_safe = 1
-mho_mutex_num = 160
-mho_hash_slot_size = 640000
-mho_hash_max_element_num = 2560000
-mho_expire_time = 30
-mho_eliminate_type = LRU
-
-#per thread
-[tuple2stream_htable]
-mho_screen_print_ctrl = 0
-mho_thread_safe = 0
-mho_mutex_num = 160
-mho_hash_slot_size = 80000
-mho_hash_max_element_num = 320000
-mho_expire_time = 0
-mho_eliminate_type = LRU
-
-[field_stat]
-remote_switch = 1
-remote_ip = 127.0.0.1
-remote_port = 58100
-local_path = ./fs2_kni.status
-stat_cycle = 1
-print_mode = 1
-# 1:FS_OUTPUT_STATSD; 2:FS_OUTPUT_INFLUX_LINE
-statsd_format = 2
-APP_NAME = fs2_kni
-
-#self test Shunt rules security policy id
-[tsg_diagnose]
-enabled = 1
-security_policy_id = 3,4
-
-
-[ssl_dynamic_bypass]
-enabled = 0
-
-#kni dynamic bypass
-[traceid2sslinfo_htable]
-mho_screen_print_ctrl = 0
-mho_thread_safe = 1
-mho_mutex_num = 160
-mho_hash_slot_size = 80000
-mho_hash_max_element_num = 320000
-mho_expire_time = 300
-mho_eliminate_type = FIFO
-
-[sslinfo2bypass_htable]
-mho_screen_print_ctrl = 0
-mho_thread_safe = 1
-mho_mutex_num = 160
-mho_hash_slot_size = 640000
-mho_hash_max_element_num = 2560000
-mho_expire_time = 300
-mho_eliminate_type = FIFO
-
-[proxy_tcp_option]
-enabled = 1
-maat_table_compile = PXY_TCP_OPTION_COMPILE
-maat_table_addr = PXY_TCP_OPTION_ADDR
-maat_table_fqdn = PXY_TCP_OPTION_SERVER_FQDN
-enable_override = 0
-client_tcp_maxseg_enable = 0
-client_tcp_maxseg = 1460
-client_tcp_nodelay =  1
-client_tcp_ttl = 70
-client_tcp_keepalive_enable = 1
-client_tcp_keepalive_keepcnt = 8
-client_tcp_keepalive_keepidle = 30
-client_tcp_keepalive_keepintvl = 15
-client_tcp_user_timeout = 600
-server_tcp_maxseg_enable = 0
-server_tcp_maxseg = 1460
-server_tcp_nodelay = 1
-server_tcp_ttl = 75
-server_tcp_keepalive_enable = 1
-server_tcp_keepalive_keepcnt = 8
-server_tcp_keepalive_keepidle = 30
-server_tcp_keepalive_keepintvl = 15
-server_tcp_user_timeout = 600
-bypass_duplicated_packet = 0
-tcp_passthrough = 0
-
-[share_session_attribute]
-SESSION_ATTRIBUTE_LABEL=TSG_MASTER_INTERNAL_LABEL

ansible/roles/traffic-engine/files/helm/templates/sapp.yaml

@@ -11,9 +11,6 @@ data:
   tsg_conn_sketch.inf: {{ tpl (.Files.Get "conf/tsg_conn_sketch.inf") . | quote }}
   sapp.toml: {{ tpl (.Files.Get "conf/sapp.toml") . | quote }}
   send_raw_pkt.conf: {{ tpl (.Files.Get "conf/send_raw_pkt.conf") . | quote }}
-{{- if and (eq .Values.proxy.enable .Values.define_enable_val_yes) (ge (len .Values.tfe_affinity) 1) }}
-  kni.conf: {{ tpl (.Files.Get "conf/kni.conf") . | quote }}
-{{- end }}
   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 }}