gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature:TSG-12140:helmchart适配tfe_affinity为null的情况

Browse Source
This commit is contained in:
fumingwei
2022-10-11 15:11:50 +08:00
committed by 付明卫
parent 2108d4a8fd
commit d821ef779e
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@
{{- if eq .Values.packet_capture.enable .Values.define_enable_val_yes }}
./plug/business/capture_packet_plug/capture_packet_plug.inf
{{- end }}
{{- if eq .Values.proxy.enable .Values.define_enable_val_yes }}
{{- 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 }}

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

@@ -11,7 +11,9 @@ 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 }}

2
ansible/roles/traffic-engine/files/helm/templates/tfe.yaml
View File

@@ -4,6 +4,8 @@ metadata:
name: tfe-{{ .Release.Name }}
namespace: default
data:
{{- if and (eq .Values.proxy.enable .Values.define_enable_val_yes) (ge (len .Values.tfe_affinity) 1) }}
tfe.conf: {{ tpl (.Files.Get "conf/tfe.conf") . | quote }}
pangu_pxy.conf: {{ tpl (.Files.Get "conf/pangu_pxy.conf") . | quote }}
{{- end }}
tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}

2
ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
View File

@@ -113,7 +113,7 @@ spec:
mountPath: /etc/localtime
readOnly: true
{{- if eq .Values.proxy.enable .Values.define_enable_val_yes }}
{{- if and (eq .Values.proxy.enable .Values.define_enable_val_yes) (ge (len .Values.tfe_affinity) 1) }}
- name: proxy
image: "{{ .Values.image.proxy.repository }}:{{ .Values.image.proxy.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.proxy.pullPolicy }}