Skip to content

K
k8syml
Commit d2d3a286 by 蒋勇
Options

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

parents 2c478812 f85626be
Showing with 104 additions and 34 deletions
yamls/tx/base/4kong-db.yaml
...@@ -14,12 +14,16 @@ spec: ...@@ -14,12 +14,16 @@ spec:
app: kong-db app: kong-db
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: kong-db name: kong-db
namespace: kong namespace: kong
spec: spec:
selector:
matchLabels:
name: kong-db
app: kong-db
template: template:
metadata: metadata:
labels: labels:
......
yamls/tx/base/6konga-dashboard.yaml
...@@ -11,11 +11,12 @@ spec: ...@@ -11,11 +11,12 @@ spec:
- name: konga - name: konga
port: 80 port: 80
targetPort: 1337 targetPort: 1337
nodePort: 31752
selector: selector:
app: konga app: konga
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: konga name: konga
...@@ -35,36 +36,20 @@ spec: ...@@ -35,36 +36,20 @@ spec:
spec: spec:
containers: containers:
- name: konga - name: konga
image: pantsel/konga image: csighub.tencentyun.com/brg_icp/tencent2020:konga.0
env: env:
- name: DB_DATABASE - name: DB_DATABASE
value: k8s_konga value: konga
- name: DB_USER - name: DB_USER
valueFrom: value: konga
configMapKeyRef:
name: zhichan-config
key: DB_USER
- name: DB_PASSWORD - name: DB_PASSWORD
valueFrom: value: konga
configMapKeyRef:
name: zhichan-config
key: DB_PWD
- name: DB_PORT - name: DB_PORT
valueFrom: value: "5432"
configMapKeyRef:
name: zhichan-config
key: DB_PORT
- name: DB_ADAPTER
value: mysql
- name: DB_HOST - name: DB_HOST
valueFrom: value: kong-dbservice
configMapKeyRef:
name: zhichan-config
key: DB_HOST
- name: NODE_ENV - name: NODE_ENV
value: development value: development
- name: TOKEN_SECRET
value: testtoken
ports: ports:
- name: konga - name: konga
containerPort: 1337 containerPort: 1337
\ No newline at end of file
yamls/tx/biz/all-ingress.yaml
...@@ -50,6 +50,22 @@ spec: ...@@ -50,6 +50,22 @@ spec:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: 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 name: brg-user-center-ingress
namespace: tencent-qifu namespace: tencent-qifu
spec: spec:
...@@ -77,7 +93,22 @@ spec: ...@@ -77,7 +93,22 @@ spec:
backend: backend:
serviceName: brg-user-service serviceName: brg-user-service
servicePort: 80 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: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: brg-user-center - 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 imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
yamls/tx/biz/brg-user-deployment.yaml
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: brg-user - 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 imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
yamls/tx/biz/deliver/ic-deployment.yaml
...@@ -18,7 +18,8 @@ spec: ...@@ -18,7 +18,8 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: ic-deliver - 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 imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
yamls/tx/biz/deliver/icp-deployment.yaml
...@@ -18,7 +18,8 @@ spec: ...@@ -18,7 +18,8 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: icp-deliver - 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 imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
yamls/tx/biz/deliver/paas-deployment.yaml
...@@ -18,7 +18,8 @@ spec: ...@@ -18,7 +18,8 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: paas - 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 imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
yamls/tx/biz/ic-name-deployment.yaml 0 → 100644
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: ...@@ -20,7 +20,7 @@ data:
REDIS_HOST: 9.139.11.100 REDIS_HOST: 9.139.11.100
REDIS_PORT: "6379" REDIS_PORT: "6379"
REDIS_PWD: Brg2020! 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_REDIS_DB: "10"
LOGS_SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicLogs.publicLogsConsumer" LOGS_SYTXPUBLIC_MSGQ_CONSUMER_NAME: "publicLogs.publicLogsConsumer"
LOGS_SYTXPUBLIC_MSGQ_QUEUED_NAME: "LOGS-SYTXPUBLIC-MSGQ" LOGS_SYTXPUBLIC_MSGQ_QUEUED_NAME: "LOGS-SYTXPUBLIC-MSGQ"
...@@ -32,9 +32,9 @@ data: ...@@ -32,9 +32,9 @@ data:
SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXPUBLIC-MSGQ" SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXPUBLIC-MSGQ"
SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXFAIL-SYTXPUBLIC-MSGQ" SYTXFAIL_SYTXPUBLIC_MSGQ_QUEUED_NAME: "SYTXFAIL-SYTXPUBLIC-MSGQ"
NOTIFY_SYTXPUBLIC_MSGQ_QUEUED_NAME: "NOTIFY-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" BRG_USER_CENTER_REDIS_DB: "5"
PAAS_DB_NAME: center-manage PAAS_DB_NAME: brg-center-manage
DELIVERY_DB_NAME: ent_deliver DELIVERY_DB_NAME: brg-ent_deliver
PAAS_REDIS_DB: "3" PAAS_REDIS_DB: "3"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment