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

yamls/jobs/calcjobs.yml

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

yamls/jobs/tmAuditData.yml

 apiVersion: batch/v2alpha1
 apiVersion: batch/v2alpha1
 kind: CronJob
 kind: CronJob
 metadata:
 metadata:
-  name: tmAuditData
+  name: tmauditdata
   namespace: job-tasks
   namespace: job-tasks
 spec:
 spec:
   schedule: "*/2 * * * *"
   schedule: "*/2 * * * *"
@@ -11,8 +11,8 @@ spec:
         spec:
         spec:
           restartPolicy: OnFailure
           restartPolicy: OnFailure
           containers:
           containers:
-          - name: tmAuditData
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:180.0.23
+          - name: tmauditdata
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.0
             imagePullPolicy: IfNotPresent
             imagePullPolicy: IfNotPresent
             env:
             env:
               - name:  TZ
               - name:  TZ
@@ -20,7 +20,7 @@ spec:
               - name:  LANG
               - name:  LANG
                 value: zh_CN.UTF-8
                 value: zh_CN.UTF-8
               - name: TASK_NAME
               - name: TASK_NAME
-            value: tmtransfer.tmAuditDataTask
+                value: rpt.parseRptTask
               - name: TASK_PARAM
               - name: TASK_PARAM
                 value: hello
                 value: hello
               - name: APP_ENV
               - name: APP_ENV
@@ -53,6 +53,5 @@ spec:
                     configMapKeyRef:
                     configMapKeyRef:
                         name:  task-config
                         name:  task-config
                         key: FK_REDIS_PWD          
                         key: FK_REDIS_PWD          
-      restartPolicy: Never
 
 
 
 

yamls/jobs/tmtransfer.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           restartPolicy: OnFailure
           containers:
           containers:
           - name: tmtransfer
           - name: tmtransfer
-            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:180.0.23
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.0.0
             imagePullPolicy: IfNotPresent
             imagePullPolicy: IfNotPresent
             env:
             env:
               - name:  TZ
               - name:  TZ
@@ -53,6 +53,6 @@ spec:
                     configMapKeyRef:
                     configMapKeyRef:
                         name:  task-config
                         name:  task-config
                         key: FK_REDIS_PWD                
                         key: FK_REDIS_PWD                
-      restartPolicy: Never
+
 
 
 
 

yamls/zhichan/xggweb-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: xggweb
       - name: xggweb
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:17.0.3
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:17.0.5
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80