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

yamls/jobs/aliicapi.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: aliicapi
-              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.2.4
+              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.1.1
               imagePullPolicy: IfNotPresent
               env:
                 - name: TZ

yamls/jobs/customer2fq.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: customertofq
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.8.2
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.6.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/igorder2fq.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: igorder2fq
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.7.1
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.7.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/taskalirpcagainpush.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: taskalirpcagainpush
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.3.0
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.4.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/taskalitmupdate.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: taskalitmupdate
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.4.1
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.5.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/taskpushpublicservice.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: aliicapi
-              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.5.7
+              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.2.1
               imagePullPolicy: IfNotPresent
               env:
                 - name: TZ

yamls/jobs/tm2fq.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: tmtofq
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.6.2
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.8.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/tmAuditData.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: tmauditdata
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.5
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.9.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/tmnotifytask.yml

+apiVersion: batch/v2alpha1
+kind: CronJob
+metadata:
+  name: tmnotifytask
+  namespace: job-tasks
+spec:
+  schedule: "0 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: OnFailure
+          containers:
+            - name: tmnotifytask
+              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.15.2
+              imagePullPolicy: IfNotPresent
+              env:
+                - name: TZ
+                  value: Asia/Shanghai
+                - name: LANG
+                  value: zh_CN.UTF-8
+                - name: TASK_NAME
+                  value: tm.tmdeliveryDing
+                - name: TASK_PARAM
+                  value: hello
+                - name: APP_ENV
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: APP_ENV
+                - name: TASK_PORT
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: TASK_PORT
+                - name: TASK_REDIS_DB
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: FK_REDIS_DB
+                - name: REDIS_HOST
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: FK_REDIS_HOST
+                - name: REDIS_PORT
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: FK_REDIS_PORT
+                - name: REDIS_PWD
+                  valueFrom:
+                    configMapKeyRef:
+                      name: task-config
+                      key: FK_REDIS_PWD

yamls/jobs/tmpaytransfer-tasks-deployment.yaml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: tmpaytransfer
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.6
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.14.2
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/tmreport.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: tmreport
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.6
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.12.1
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ

yamls/jobs/tmtransfer.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: tmtransfer
-              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.10.3
+              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.13.1
               imagePullPolicy: IfNotPresent
               env:
                 - name: TZ

yamls/jobs/tmtransferneed.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: tmtransferneed
-              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.11.3
+              image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:188.10.2
               imagePullPolicy: IfNotPresent
               env:
                 - name: TZ

yamls/jobs/zcbusinesschance.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: zcbusinesschance
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.1.1
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.1.6
             imagePullPolicy: IfNotPresent
             env:
               - name:  TZ