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

yamls/config/version2yaml.js

@@ -9,5 +9,6 @@ module.exports = {
     '1.0': "igirl|zhichan/igirl-web-deployment.yaml",
     '1230.0': "marketplat|zhichan/newtime/marketplat-deployment.yaml",
     '1240.0': "mmc|zhichan/newtime/mmc-deployment.yaml",
+    '1270.0': "jiaxiya|zhichan/newtime/zhiquanquan-deployment.yaml",
     '80.1': "center-channel|zhichan/center-channel-deployment.yaml"
 }
\ No newline at end of file

yamls/jobs/tmtransfer.yml

@@ -4,7 +4,7 @@ metadata:
   name: tmtransfer
   namespace: job-tasks
 spec:
-  schedule: "* */2 * * *"
+  schedule: "*/20 * * * *"
   jobTemplate:
     spec:
       template:
@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: tmtransfer
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.6
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.10.2
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ
@@ -20,7 +20,7 @@ spec:
               - name:  LANG
                 value: zh_CN.UTF-8
               - name: TASK_NAME
-                value: tmtransfer.tmtransferTask
+                value: tmtransfer.tmtransactionTask
               - name: TASK_PARAM
                 value: hello
               - name: APP_ENV

yamls/zhichan/all-ingress.yaml

@@ -45,7 +45,6 @@ spec:
               serviceName: bpoweb-service
               servicePort: 80
 ---
-
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -61,7 +60,6 @@ spec:
               serviceName: bpoweb-service
               servicePort: 80
 ---
-
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -337,22 +335,6 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: jiaxiya-ingress
-  namespace: chaolai
-spec:
-  rules:
-    - host: jiaxiya.gongsibao.com
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: jiaxiya-service
-              servicePort: 80
-
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
   name: embedapp-ingress
   namespace: chaolai
 spec:

yamls/zhichan/newtime/newingress.yaml

@@ -180,3 +180,29 @@ spec:
             backend:
               serviceName: mmc-service
               servicePort: 80
+
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: jiaxiya-ingress
+  namespace: newtime
+  annotations:
+    configuration.konghq.com: kongingress-strip-path
+spec:
+  rules:
+    - host: jiaxiya.gongsibao.com
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: jiaxiya-service
+              servicePort: 80
+          - path: /web
+            backend:
+              serviceName: jiaxiya-service
+              servicePort: 80
+          - path: /api
+            backend:
+              serviceName: jiaxiya-service
+              servicePort: 80