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

yamls/jobs/calcjobs.yml

@@ -12,7 +12,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - 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
             env:
             - name:  TZ

yamls/jobs/tmAuditData.yml

 apiVersion: batch/v2alpha1
 kind: CronJob
 metadata:
-  name: tmAuditData
+  name: tmauditdata
   namespace: job-tasks
 spec:
   schedule: "*/2 * * * *"
@@ -11,48 +11,47 @@ spec:
         spec:
           restartPolicy: OnFailure
           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
             env:
-            - name:  TZ
-            value: Asia/Shanghai
-          - name:  LANG
-            value: zh_CN.UTF-8
-          - name: TASK_NAME
-            value: tmtransfer.tmAuditDataTask
-          - 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          
-      restartPolicy: Never
+              - name:  TZ
+                value: Asia/Shanghai
+              - name:  LANG
+                value: zh_CN.UTF-8
+              - name: TASK_NAME
+                value: rpt.parseRptTask
+              - 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/tmtransfer.yml

@@ -12,47 +12,47 @@ spec:
           restartPolicy: OnFailure
           containers:
           - 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
             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
-          - 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          
-      restartPolicy: Never
+              - 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
+              - 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/zhichan/xggweb-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - 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
         ports:
         - containerPort: 80