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

the commit.

yamls/zhichan/newtime/newingress.yaml

@@ -11,42 +11,34 @@ spec:
       http:
         paths:
           - path: /
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web/auth/userCtl/pmgetUserByCode
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web/auth/userCtl/pmlogin
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web/auth/userCtl/pmregister
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web/auth/userCtl/pmSendVCode
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web/auth/userCtl/pmloginByVCode
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /api
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80
           - path: /web
-            pathType: Prefix
             backend:
               serviceName: paas-service
               servicePort: 80

yamls/zhichan/ucommune-back-deployment.yaml

-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ucommune-back
-  namespace: chaolai
-  labels:
-    app: ucommune-back
-spec:
-  replicas: 2
-  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:80.1.4
-        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: chaolai
-spec:
-  type: NodePort
-  ports:
-    - port: 80
-      targetPort: 80
-      nodePort: 19813
-  selector:
-      app: ucommune-back