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

yamls/zhichan/notify-sytxpublic-msgq-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: notify-sytxpublic-msgq
+  namespace: chaolai
+  labels:
+    app: notify-sytxpublic-msgq
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: notify-sytxpublic-msgq
+  template:
+    metadata:
+      labels:
+        app: notify-sytxpublic-msgq
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: notify-sytxpublic-msgq
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1040.0.41
+        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:  QUEUE_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: QUEUE_DB_NAME
+        - name:  QUEUE_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXPUBLIC_MSGQ_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:  CONSUMER_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NOTIFY_SYTXPUBLIC_MSGQ_CONSUMER_NAME
+        - name:  QUEUED_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME                  
+                  
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: notify-sytxpublic-msgq-service
+  name: notify-sytxpublic-msgq-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+      app: notify-sytxpublic-msgq

yamls/zhichan/sytxfail-sytxpublic-msgq-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sytxfail-sytxpublic-msgq
+  namespace: chaolai
+  labels:
+    app: sytxfail-sytxpublic-msgq
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: sytxfail-sytxpublic-msgq
+  template:
+    metadata:
+      labels:
+        app: sytxfail-sytxpublic-msgq
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: sytxfail-sytxpublic-msgq
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1040.0.41
+        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:  QUEUE_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: QUEUE_DB_NAME
+        - name:  QUEUE_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXPUBLIC_MSGQ_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:  CONSUMER_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXFAIL_SYTXPUBLIC_MSGQ_CONSUMER_NAME
+        - name:  QUEUED_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME                  
+                  
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: sytxfail-sytxpublic-msgq-service
+  name: sytxfail-sytxpublic-msgq-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+      app: sytxfail-sytxpublic-msgq

yamls/zhichan/sytxpublic-msgq-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sytxpublic-msgq
+  namespace: chaolai
+  labels:
+    app: sytxpublic-msgq
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: sytxpublic-msgq
+  template:
+    metadata:
+      labels:
+        app: sytxpublic-msgq
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: sytxpublic-msgq
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1040.0.41
+        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:  QUEUE_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: QUEUE_DB_NAME
+        - name:  QUEUE_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXPUBLIC_MSGQ_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:  CONSUMER_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXPUBLIC_MSGQ_CONSUMER_NAME
+        - name:  QUEUED_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: SYTXPUBLIC_MSGQ_QUEUED_NAME                  
+                  
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: sytxpublic-msgq-service
+  name: sytxpublic-msgq-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+      app: sytxpublic-msgq

yamls/zhichan/zhichanconfigmap.yaml

@@ -129,3 +129,16 @@ data:
   ESIGNSVEORDER_REDIS_DB: "3"
   ESIGNSVEUC_DB_NAME: esign-sve-uc
   ESIGNSVEUC_REDIS_DB: "3"
+  
+  QUEUE_DB_NAME: brg-tx-queue-log 
+  LOGS_SYTXPUBLIC_MSGQ_REDIS_DB: "10"
+  LOGS_SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicLogs.publicLogsConsumer"
+  LOGS_SYTXPUBLIC_MSGQ_QUEUED_NAME: "LOGS-SYTXPUBLIC-MSGQ"
+  LOGSFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "LOGSFAIL-SYTXPUBLIC-MSGQ"  
+  SYTXPUBLIC_MSGQ_REDIS_DB: "9"
+  SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicServiceAllocation.publicConsumer"
+  SYTXFAIL_SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicFail.publicFailConsumer"
+  NOTIFY_SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicNotify.publicNotifyConsumer"
+  SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXPUBLIC-MSGQ"
+  SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXFAIL-SYTXPUBLIC-MSGQ"
+  NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-SYTXPUBLIC-MSGQ"
\ No newline at end of file