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

yamls/jobs/tmAuditData.yml

+apiVersion: batch/v2alpha1
+kind: CronJob
+metadata:
+  name: tmAuditData
+  namespace: job-tasks
+spec:
+  schedule: "*/2 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: OnFailure
+          containers:
+          - name: tmAuditData
+            image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:180.0.23
+            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
+
+

yamls/jobs/tmtransfer.yml

@@ -4,7 +4,7 @@ metadata:
   name: tmtransfer
   name: tmtransfer
   namespace: job-tasks
   namespace: job-tasks
 spec:
 spec:
-  schedule: "*/2 * * * *"
+  schedule: "* */2 * * *"
   jobTemplate:
   jobTemplate:
     spec:
     spec:
       template:
       template:

yamls/zhichan/xggweb-deployment.yaml

@@ -12,13 +12,13 @@ spec:
         app: xggweb
         app: xggweb
   template:
   template:
     metadata:
     metadata:
-      labels:
+      labels: 
         app: xggweb
         app: xggweb
     spec:
     spec:
       restartPolicy: Always
       restartPolicy: Always
       containers:
       containers:
       - name: xggweb
       - name: xggweb
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:17.0.2
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:17.0.3
         imagePullPolicy: IfNotPresent
         imagePullPolicy: IfNotPresent
         ports:
         ports:
         - containerPort: 80
         - containerPort: 80