Merge branch 'master-高质量运营' into uat_code

# Conflicts:
#	deployment-uat.yaml

deployment-master.yaml

@@ -43,6 +43,11 @@ spec:
         persistentVolumeClaim:
           claimName: file-pvc
           readOnly: false
+      hostAliases:
+        - ip: "10.238.9.62"
+          hostnames:
+            - "oss-cn-xian-unicom-d01-a.i.super.xixian.unicom.local"
+            - "eshop-mall-jl.oss-cn-xian-unicom-d01-a.i.super.xixian.unicom.local"
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

deployment-uat.yaml

@@ -40,6 +40,10 @@ spec:
         - name: log
           hostPath:
             path: /var/lib/docker/log/349553515466-uat/default-group/all  #开发环境
+      hostAliases:
+        - ip: "10.242.0.95"
+          hostnames:
+            - "test-mall3.oss-cn-guangzhou-gz-d01-a.ops.super.guangzhou.unicom.local"
       # 必选，Pod中容器列表
       containers:
         - name: biz-service-ebtp-extend