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

yamls/zhichan/all-ingress.yaml

@@ -1229,5 +1229,53 @@ spec:
       - path: /
       - path: /
         backend:
         backend:
           serviceName: center-channel-service
           serviceName: center-channel-service
-          servicePort: 80              
+          servicePort: 80   
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: zhengce-center-channel-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: zhengce.qifu.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: center-channel-service
+          servicePort: 80
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: jd-center-channel-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: jd.qifu.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: center-channel-service
+          servicePort: 80
+---         
+          
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: center-order-ingress
+  namespace: chaolai
+spec:
+  rules:
+  - host: channelorder.gongsibao.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: center-order-service
+          servicePort: 80            
 
 

yamls/zhichan/center-app-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: center-app
       - name: center-app
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:90.0.3
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:90.0.5
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80

yamls/zhichan/center-channel-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: center-channel
       - name: center-channel
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:80.0.3
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:80.0.9
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80

yamls/zhichan/center-order-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: center-order
+  namespace: chaolai
+  labels:
+    app: center-order
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: center-order
+  template:
+    metadata:
+      labels:
+        app: center-order
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: center-order
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:81.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_ORDER_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_ORDER_DB_NAME
+        - name:  CENTER_ORDER_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_ORDER_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: center-order-service
+  name: center-order-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 19813
+  selector:
+      app: center-order

yamls/zhichan/zhichanconfigmap.yaml

@@ -76,7 +76,9 @@ data:
   FK_REDIS_HOST: r-2zejem2xk438n71rny.redis.rds.aliyuncs.com
   FK_REDIS_HOST: r-2zejem2xk438n71rny.redis.rds.aliyuncs.com
   FK_REDIS_PORT: "6379"
   FK_REDIS_PORT: "6379"
   FK_REDIS_PWD: yo#@eXz9EMpa+5O
   FK_REDIS_PWD: yo#@eXz9EMpa+5O
-  CENTER_CHANNEL_DB_NAME: center_channel
-  CENTER_CHANNEL_REDIS_DB: "8"
   CENTER_APP_DB_NAME: center_app
   CENTER_APP_DB_NAME: center_app
-  CENTER_APP_REDIS_DB: "7"
+  CENTER_APP_REDIS_DB: "7"  
+  CENTER_CHANNEL_DB_NAME: igirl_api
+  CENTER_CHANNEL_REDIS_DB: "8"
+  CENTER_ORDER_DB_NAME: center_order
+  CENTER_ORDER_REDIS_DB: "9"