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

yamls/jobs/tmpaytransfer-tasks-deployment.yaml

+apiVersion: batch/v2alpha1
+kind: CronJob
+metadata:
+  name: tmpaytransfer
+  namespace: job-tasks
+spec:
+  schedule: "*/5 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: OnFailure
+          containers:
+          - name: tmpaytransfer
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.6
+            imagePullPolicy: IfNotPresent
+            env:
+              - name:  TZ
+                value: Asia/Shanghai
+              - name:  LANG
+                value: zh_CN.UTF-8
+              - name: TASK_NAME
+                value: tmtransfer.tmtransferTask
+              - name: TASK_PARAM
+                value: hello
+              - name: APP_ENV
+                valueFrom:
+                  configMapKeyRef:
+                      name: task-config
+                      key: APP_ENV              
\ No newline at end of file

yamls/zhichan/all-ingress.yaml

@@ -1436,11 +1436,11 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: caishui-qifu-ingress
+  name: haoming-qifu-ingress
   namespace: chaolai
 spec:
   rules:
-    - host: caishui.qifu.gongsibao.com
+    - host: haoming.gongsibao.com
       http:
         paths:
           - path: /
@@ -1451,27 +1451,26 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: youke-qifu-ingress
+  name: haoming-qifu01-ingress
   namespace: chaolai
 spec:
   rules:
-    - host: youke.qifu.gongsibao.com
+    - host: haoming.qifu.gongsibao.com
       http:
         paths:
           - path: /
             backend:
               serviceName: center-channel-service
               servicePort: 80
-
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: zhongchuan-qifu-ingress
+  name: caishui-qifu-ingress
   namespace: chaolai
 spec:
   rules:
-    - host: zhongchuan.qifu.gongsibao.com
+    - host: caishui.qifu.gongsibao.com
       http:
         paths:
           - path: /
@@ -1482,26 +1481,42 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: douyin-qifu-ingress
+  name: youke-qifu-ingress
   namespace: chaolai
 spec:
   rules:
-    - host: douyin.qifu.gongsibao.com
+    - host: youke.qifu.gongsibao.com
       http:
         paths:
           - path: /
             backend:
               serviceName: center-channel-service
               servicePort: 80
+
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: haoming-qifu-ingress
+  name: zhongchuan-qifu-ingress
   namespace: chaolai
 spec:
   rules:
-    - host: haoming.qifu.gongsibao.com
+    - host: zhongchuan.qifu.gongsibao.com
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: center-channel-service
+              servicePort: 80
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: douyin-qifu-ingress
+  namespace: chaolai
+spec:
+  rules:
+    - host: douyin.qifu.gongsibao.com
       http:
         paths:
           - path: /