Merge branch 'master' of gitlab.gongsibao.com:jiangyong/k8syml

yamls/zhichan/bpo-admin-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: bpoadmin
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:9.0.29
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:9.0.30
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/bpo-web-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: bpoweb
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.0.65
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.0.66
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/xggadmin-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: xggadmin
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.27
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.28
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/xggsve-invoice-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: xggsveinvoice
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:14.0.7
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:14.0.8
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/xggsve-trade-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: xggsvetrade
+  namespace: chaolai
+  labels:
+    app: xggsvetrade
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: xggsvetrade
+  template:
+    metadata:
+      labels:
+        app: xggsvetrade
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: xggsvetrade
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:25.0.0
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        env:
+        - name:  TZ
+          value: Asia/Shanghai
+        - name:  LANG
+          value: zh_CN.UTF-8
+        - name: APP_ENV
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: APP_ENV
+        - name: DB_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_HOST
+        - name:  DB_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PORT
+        - name:  DB_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PWD
+        - name:  DB_USER
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_USER
+        - name:  XGGSVETRADE_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSVETRADE_DB_NAME
+        - name:  XGGSVETRADE_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSVETRADE_REDIS_DB
+        - name:  REDIS_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_HOST
+        - name:  REDIS_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PORT
+        - name:  REDIS_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PWD
+
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: xggsvetrade-service
+  name: xggsvetrade-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 22000
+  selector:
+      app: xggsvetrade

yamls/zhichan/zhichanconfigmap.yaml

@@ -57,11 +57,12 @@ data:
   XGGSAASPLATFORM_REDIS_DB: "6"
   XGGSAASMERCHANT_DB_NAME: xgg
   XGGSAASMERCHANT_REDIS_DB: "6"
-
   XGGPC_DB_NAME: xgg-pc
   XGGPC_REDIS_DB: "3"
   XGGSVECOMMON_DB_NAME: xgg-common
   XGGSVECOMMON_REDIS_DB: "3"
+  XGGSVETRADE_DB_NAME: xgg-trade
+  XGGSVETRADE_REDIS_DB: "3"
   XGGSVEMERCHANT_DB_NAME: xgg-merchant
   XGGSVEMERCHANT_REDIS_DB: "3"
   XGGSVEORDER_DB_NAME: xgg-order