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

feature:TSG-18563:修复因为使用sed -i命令修改emptyDir挂载文件时出现"Device or resource busy"错误的bug

Browse Source
This commit is contained in:
fumingwei
2024-01-10 18:31:51 +08:00
parent 436bb904e9
commit 3430147612
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
View File

@@ -49,11 +49,11 @@ spec:
{{- end }}
{{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
{{- include "traffic-engine.global.cm.read-server-ip" . | nindent 12 }}
sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sapp/tsgconf/maat.conf
sed -Ei -c "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sapp/tsgconf/maat.conf
{{- end }}
{{- if eq .Values.external_resources.sd.connectivity "local_cache" }}
{{- include "traffic-engine.global.sd.read-server-ip" . | nindent 12 }}
sed -Ei "s|SD_POLICY_LOCAL_CACHE_IP_LOCATION|${SD_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sapp/tsgconf/maat.conf
sed -Ei -c "s|SD_POLICY_LOCAL_CACHE_IP_LOCATION|${SD_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sapp/tsgconf/maat.conf
{{- end }}
{{- if eq .Values.debug.firewall.enable_prestart_script .Values.define_enable_val_yes }}
chmod 0755 /opt/tsg/scripts/prestart.sh

4
ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
View File

@@ -49,7 +49,7 @@ spec:
{{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
{{- include "public.prepare-access-API" . | nindent 12 }}
{{- include "traffic-engine.global.cm.read-server-ip" . | nindent 12 }}
sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/tfe/conf/tfe/tfe.conf
sed -Ei -c "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/tfe/conf/tfe/tfe.conf
{{- end }}
{{- if eq .Values.debug.proxy.enable_prestart_script .Values.define_enable_val_yes }}
chmod 0755 /opt/tsg/scripts/prestart.sh
@@ -126,7 +126,7 @@ spec:
{{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
{{- include "public.prepare-access-API" . | nindent 12 }}
{{- include "traffic-engine.global.cm.read-server-ip" . | nindent 12 }}
sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/certstore/conf/cert_store.ini
sed -Ei -c "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/certstore/conf/cert_store.ini
{{- end }}
exec /opt/tsg/certstore/bin/certstore
securityContext:

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

@@ -49,7 +49,7 @@ spec:
{{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
{{- include "public.prepare-access-API" . | nindent 12 }}
{{- include "traffic-engine.global.cm.read-server-ip" . | nindent 12 }}
sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sce/conf/sce.conf
sed -Ei -c "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/sce/conf/sce.conf
{{- end }}
{{- if eq .Values.debug.service_chaining.enable_prestart_script .Values.define_enable_val_yes }}
chmod 0755 /opt/tsg/scripts/prestart.sh

8
ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
View File

@@ -49,7 +49,7 @@ spec:
{{- include "public.prepare-access-API" . | nindent 12 }}
{{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
{{- include "traffic-engine.global.cm.read-server-ip" . | nindent 12 }}
sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei -c "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
{{- end }}
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=="cluster-announce-port") | .nodePort')
@@ -58,9 +58,9 @@ spec:
echo "export HEALTH_CHECK_ANNOUNCE_PORT=${HEALTH_CHECK_ANNOUNCE_PORT}" >> /etc/profile.d/announceinfo.sh
chmod 0755 /etc/profile.d/announceinfo.sh
sed -Ei "s|NODE_IP_LOCATION|${NODE_IP?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei "s|CLUSTER_ANNOUNCE_PORT_LOCATION|${CLUSTER_ANNOUNCE_PORT?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei "s|HEALTH_CHECK_ANNOUNCE_PORT_LOCATION|${HEALTH_CHECK_ANNOUNCE_PORT?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei -c "s|NODE_IP_LOCATION|${NODE_IP?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei -c "s|CLUSTER_ANNOUNCE_PORT_LOCATION|${CLUSTER_ANNOUNCE_PORT?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
sed -Ei -c "s|HEALTH_CHECK_ANNOUNCE_PORT_LOCATION|${HEALTH_CHECK_ANNOUNCE_PORT?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
{{- if eq .Values.debug.shaping.enable_prestart_script .Values.define_enable_val_yes }}
chmod 0755 /opt/tsg/scripts/prestart.sh
/opt/tsg/scripts/prestart.sh