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

yamls/zhichan/all-ingress.yaml

@@ -205,6 +205,40 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
+  name: xggsaasplatform-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: ss-platform.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: xggsaasplatform-service
+          servicePort: 80
+
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: xggsaasmerchant-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: ss-merchant.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: xggsaasmerchant-service
+          servicePort: 80
+
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: scratchweb-ingress
   namespace: chaolai
 spec:

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.62
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.0.65
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/xggsaaas-merchant-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: xggsaasmerchant
+  namespace: chaolai
+  labels:
+    app: xggsaasmerchant
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: xggsaasmerchant
+  template:
+    metadata:
+      labels:
+        app: xggsaasmerchant
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: xggsaasmerchant
+        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: XGGSAASMERCHANT_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSAASMERCHANT_DB_NAME
+        - name:  XGGSAASMERCHANT_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSAASMERCHANT_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: xggsaasmerchant-service
+  name: xggsaasmerchant-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 21900
+  selector:
+      app: xggsaasmerchant

yamls/zhichan/xggsaaas-platform-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: xggsaasplatform
+  namespace: chaolai
+  labels:
+    app: xggsaasplatform
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: xggsaasplatform
+  template:
+    metadata:
+      labels:
+        app: xggsaasplatform
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: xggsaasplatform
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:24.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: XGGSAASPLATFORM_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSAASPLATFORM_DB_NAME
+        - name:  XGGSAASPLATFORM_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: XGGSAASPLATFORM_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: xggsaasplatform-service
+  name: xggsaasplatform-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 21800
+  selector:
+      app: xggsaasplatform

yamls/zhichan/zhichanconfigmap.yaml

@@ -47,14 +47,17 @@ data:
   PM_REDIS_DB: "5"
   EMBED_REDIS_DB: "4"
   EMBED_DB_NAME: embedapp
-  XGGADMIN_DB_NAME: xgg
-  XGGADMIN_REDIS_DB: "6"
   XGGDELIVER_DB_NAME: xgg
-  XGGDELIVER_REDIS_DB: "6"
+  XGGDELIVER_REDIS_DB: "3"
   XGGWEB_DB_NAME: xgg
   XGGWEB_REDIS_DB: "3"
   XGGADMIN_DB_NAME: xgg
   XGGADMIN_REDIS_DB: "3"
+  XGGSAASPLATFORM_DB_NAME: xgg
+  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