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

yamls/tx/base/4kong-db.yaml

@@ -14,12 +14,16 @@ spec:
     app: kong-db
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kong-db
   namespace: kong
 spec:
+  selector:
+    matchLabels:
+      name: kong-db
+      app: kong-db
   template:
     metadata:
       labels:

yamls/tx/base/6konga-dashboard.yaml

@@ -11,11 +11,12 @@ spec:
   - name: konga
     port: 80
     targetPort: 1337
+    nodePort: 31752
   selector:
     app: konga
  
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: konga
@@ -35,36 +36,20 @@ spec:
     spec:
       containers:
       - name: konga
-        image: pantsel/konga
+        image: csighub.tencentyun.com/brg_icp/tencent2020:konga.0
         env:
           - name: DB_DATABASE
-            value: k8s_konga
+            value: konga
           - name: DB_USER
-            valueFrom:
-              configMapKeyRef:
-                  name: zhichan-config
-                  key: DB_USER
+            value: konga
           - name: DB_PASSWORD
-            valueFrom:
-              configMapKeyRef:
-                  name: zhichan-config
-                  key: DB_PWD
+            value: konga
           - name: DB_PORT
-            valueFrom:
-              configMapKeyRef:
-                  name: zhichan-config
-                  key: DB_PORT
-          - name: DB_ADAPTER
-            value: mysql
+            value: "5432"
           - name: DB_HOST
-            valueFrom:
-              configMapKeyRef:
-                  name: zhichan-config
-                  key: DB_HOST
+            value: kong-dbservice
           - name: NODE_ENV
             value: development
-          - name: TOKEN_SECRET
-            value: testtoken
         ports:
         - name: konga
-          containerPort: 1337
+          containerPort: 1337
\ No newline at end of file

yamls/tx/biz/all-ingress.yaml

@@ -50,6 +50,22 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
+  name: sytxpublic-msgq-ingress
+  namespace: tencent-qifu
+spec:
+  rules:
+  - host: queue.brg.tencentyun.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: sytxpublic-msgq-service
+          servicePort: 80          
+---
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
   name: brg-user-center-ingress
   namespace: tencent-qifu
 spec:
@@ -77,7 +93,22 @@ spec:
         backend:
           serviceName: brg-user-service
           servicePort: 80
+---
 
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ic-name-ingress
+  namespace: tencent-qifu
+spec:
+  rules:
+  - host: icname.brg.tencentyun.com
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: ic-name-service
+          servicePort: 80
 
 
 

yamls/tx/biz/brg-user-center-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: brg-user-center
-        image: csighub.tencentyun.com/brg_icp/tencent2020:brg.user.center.1
+        image: csighub.tencentyun.com/brg_icp/tencent2020:brg.user.center.2
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/tx/biz/brg-user-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: brg-user
-        image: csighub.tencentyun.com/brg_icp/tencent2020:brg.user.0
+        image: csighub.tencentyun.com/brg_icp/tencent2020:brg.user.1
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/tx/biz/deliver/ic-deployment.yaml

@@ -18,7 +18,8 @@ spec:
       restartPolicy: Always
       containers:
       - name: ic-deliver
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1210.0.1
+        #image: pull registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1210.0.1
+        image: csighub.tencentyun.com/brg_icp/tencent2020:ic.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/tx/biz/deliver/icp-deployment.yaml

@@ -18,7 +18,8 @@ spec:
       restartPolicy: Always
       containers:
       - name: icp-deliver
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1220.0.1
+        #image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1220.0.1
+        image: csighub.tencentyun.com/brg_icp/tencent2020:icp.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/tx/biz/deliver/paas-deployment.yaml

@@ -18,7 +18,8 @@ spec:
       restartPolicy: Always
       containers:
       - name: paas
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1200.0.2
+        #image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1200.0.2
+        image: csighub.tencentyun.com/brg_icp/tencent2020:paas.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/tx/biz/ic-name-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ic-name
+  namespace: tencent-qifu
+  labels:
+    app: ic-name
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: ic-name
+  template:
+    metadata:
+      labels:
+        app: ic-name
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: ic-name
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:700.0.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        env:
+        - name:  TZ
+          value: Asia/Shanghai
+        - name:  LANG
+          value: zh_CN.UTF-8
+
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: ic-name-service
+  name: ic-name-service
+  namespace: tencent-qifu
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+      app: ic-name
+

yamls/tx/base/7zhichanconfigmap.yaml → yamls/tx/biz/zhichanconfigmap.yaml

@@ -20,7 +20,7 @@ data:
   REDIS_HOST: 9.139.11.100
   REDIS_PORT: "6379"
   REDIS_PWD: Brg2020!    
-  QUEUE_DB_NAME: tx-queue-log
+  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"
@@ -32,9 +32,9 @@ data:
   SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXPUBLIC-MSGQ"
   SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXFAIL-SYTXPUBLIC-MSGQ"
   NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-SYTXPUBLIC-MSGQ"
-  BRG_USER_CENTER_DB_NAME: tx-shop
+  BRG_USER_CENTER_DB_NAME: brg-tx-shop
   BRG_USER_CENTER_REDIS_DB: "5"  
   
-  PAAS_DB_NAME: center-manage
-  DELIVERY_DB_NAME: ent_deliver
-  PAAS_REDIS_DB: "3"
+  PAAS_DB_NAME: brg-center-manage
+  DELIVERY_DB_NAME: brg-ent_deliver
+  PAAS_REDIS_DB: "3"
\ No newline at end of file