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

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

@@ -1497,6 +1497,21 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
+  name: haoming-qifu-ingress
+  namespace: chaolai
+spec:
+  rules:
+    - host: haoming.qifu.gongsibao.com
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: center-channel-service
+              servicePort: 80              
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: operate-ingress
   namespace: newtime
 spec:

yamls/zhichan/center-tmtransaction-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: center-tmtransaction
+  namespace: chaolai
+  labels:
+    app: center-tmtransaction
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: center-tmtransaction
+  template:
+    metadata:
+      labels:
+        app: center-tmtransaction
+    spec:
+      restartPolicy: Always
+      containers:
+        - name: center-tmtransaction
+          image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:98.0.2
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 80
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+            - name: LANG
+              value: zh_CN.UTF-8
+            - name: APP_ENV
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: APP_ENV
+            - name: DB_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_HOST
+            - name: DB_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PORT
+            - name: DB_PWD
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PWD
+            - name: DB_USER
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_USER
+            - name: CENTER_TMTRANSACTION_DB_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_TMTRANSACTION_DB_NAME
+            - name: CENTER_TMTRANSACTION_REDIS_DB
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: CENTER_TMTRANSACTION_REDIS_DB
+            - name: REDIS_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_HOST
+            - name: REDIS_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PORT
+            - name: REDIS_PWD
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PWD
+
+            - name: NODE_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+    app: center-tmtransaction-service
+  name: center-tmtransaction-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 19911
+  selector:
+    app: center-tmtransaction

yamls/zhichan/zhichanconfigmap.yaml

@@ -142,5 +142,7 @@ data:
   SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXPUBLIC-MSGQ"
   SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXFAIL-SYTXPUBLIC-MSGQ"
   NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-SYTXPUBLIC-MSGQ"
+  CENTER_TMTRANSACTION_DB_NAME: "center-tmtransaction"
+  CENTER_TMTRANSACTION_REDIS_DB: "7"
 
   
\ No newline at end of file