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

yamls/zhichan/all-ingress.yaml

@@ -274,6 +274,23 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
+  name: bdanalysis-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: zc-report.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: bdanalysis-service
+          servicePort: 80
+
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: scratchweb-ingress
   namespace: chaolai
 spec:

yamls/zhichan/bd-analysis-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: bdanalysis
+  namespace: chaolai
+  labels:
+    app: bdanalysis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: bdanalysis
+  template:
+    metadata:
+      labels:
+        app: bdanalysis
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: bdanalysis
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:50.0.6
+        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: BPOSTAT_DB_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: BPOSTAT_DB_HOST
+        - name:  BPOSTAT_DB_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: BPOSTAT_DB_PORT
+        - name:  BPOSTAT_DB_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: BPOSTAT_DB_PWD
+        - name:  BPOSTAT_DB_USER
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key:  BPOSTAT_DB_USER
+        - name: BDANALYSIS_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: BDANALYSIS_DB_NAME
+        - name:  BDANALYSIS_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: BDANALYSIS_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: bdanalysis-service
+  name: bdanalysis-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 22100
+  selector:
+      app: bdanalysis

yamls/zhichan/xggdeliver-deployment.yaml

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

yamls/zhichan/xggsaas-merchant-deployment.yaml

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

yamls/zhichan/xggsaas-platform-deployment.yaml

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

yamls/zhichan/xggsve-order-deployment.yaml

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

yamls/zhichan/zhichanconfigmap.yaml

@@ -105,4 +105,6 @@ data:
   ALIXGGSVEINVOICE_DB_NAME: ali-xgg-invoice
   ALIXGGSVEINVOICE_REDIS_DB: "3"
   ALIXGGSVEUC_DB_NAME: ali-xgg-uc
-  ALIXGGSVEUC_REDIS_DB: "3"
\ No newline at end of file
+  ALIXGGSVEUC_REDIS_DB: "3"
+  BDANALYSIS_DB_NAME: bd-analysis
+  BDANALYSIS_REDIS_DB: "3"
\ No newline at end of file