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

yamls/zhichan/all-ingress.yaml

@@ -1597,6 +1597,38 @@ spec:
 apiVersion: extensions/v1beta1
 apiVersion: extensions/v1beta1
 kind: Ingress
 kind: Ingress
 metadata:
 metadata:
+  name: zhongchuan-qifu-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: zhongchuan.qifu.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: center-channel-service
+          servicePort: 80
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ucommune-qifu-ingress
+  namespace: newtime
+spec:
+  rules:
+  - host: ucommune.qifu.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: ucommune-back-service
+          servicePort: 80
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: fqgsbweb-gongsibao-ingress
   name: fqgsbweb-gongsibao-ingress
   namespace: chaolai
   namespace: chaolai
 spec:
 spec:

yamls/zhichan/newtime/ucommune-back-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ucommune-back
+  namespace: newtime
+  labels:
+    app: ucommune-back
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: ucommune-back
+  template:
+    metadata:
+      labels:
+        app: ucommune-back
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: ucommune-back
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1300.0.1
+        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:  CENTER_CHANNEL_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_CHANNEL_DB_NAME
+        - name:  CENTER_CHANNEL_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_CHANNEL_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: ucommune-back-service
+  name: ucommune-back-service
+  namespace: newtime
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+      app: ucommune-back

yamls/zhichan/newtime/zhichanconfigmap.yaml

@@ -33,6 +33,8 @@ data:
   NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-SYTXPUBLIC-MSGQ"
   NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-SYTXPUBLIC-MSGQ"
   BRG_USER_CENTER_DB_NAME: brg-tx-shop
   BRG_USER_CENTER_DB_NAME: brg-tx-shop
   BRG_USER_CENTER_REDIS_DB: "5"
   BRG_USER_CENTER_REDIS_DB: "5"
+  CENTER_CHANNEL_DB_NAME: igirl_api
+  CENTER_CHANNEL_REDIS_DB: "8"
 
 
   PAAS_DB_NAME: center-manage
   PAAS_DB_NAME: center-manage
   DELIVERY_DB_NAME: ent_deliver
   DELIVERY_DB_NAME: ent_deliver