Commit 576f0669 by 蒋勇

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

parents 7f23713b f953ed8f
......@@ -4,7 +4,7 @@ metadata:
name: aliicapi
namespace: job-tasks
spec:
schedule: "0 */2 * * *"
schedule: "*/3 * * * *"
jobTemplate:
spec:
template:
......@@ -12,7 +12,7 @@ spec:
restartPolicy: OnFailure
containers:
- name: aliicapi
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.2.1
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.2.3
imagePullPolicy: IfNotPresent
env:
- name: TZ
......@@ -20,7 +20,7 @@ spec:
- name: LANG
value: zh_CN.UTF-8
- name: TASK_NAME
value: alichannel.aliicapitask
value: alichannel.aliicapiTask
- name: TASK_PARAM
value: hello
- name: APP_ENV
......
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggadmin
namespace: chaolai
labels:
app: alixggadmin
spec:
replicas: 1
selector:
matchLabels:
app: alixggadmin
template:
metadata:
labels:
app: alixggadmin
spec:
restartPolicy: Always
containers:
- name: alixggadmin
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1601.0.31
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: XGGADMIN_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGADMIN_DB_NAME
- name: XGGADMIN_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGADMIN_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: alixggadmin-service
name: alixggadmin-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 21001
selector:
app: alixggadmin
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggdeliver
namespace: chaolai
labels:
app: alixggdeliver
spec:
replicas: 1
selector:
matchLabels:
app: alixggdeliver
template:
metadata:
labels:
app: alixggdeliver
spec:
restartPolicy: Always
containers:
- name: alixggdeliver
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:1901.0.16
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: XGGDELIVER_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGDELIVER_DB_NAME
- name: XGGDELIVER_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGDELIVER_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: alixggdeliver-service
name: alixggdeliver-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 21301
selector:
app: alixggdeliver
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggsvecommon
namespace: chaolai
labels:
app: alixggsvecommon
spec:
replicas: 1
selector:
matchLabels:
app: alixggsvecommon
template:
metadata:
labels:
app: alixggsvecommon
spec:
restartPolicy: Always
containers:
- name: alixggsvecommon
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:11.0.10
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: XGGSVECOMMON_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVECOMMON_DB_NAME
- name: XGGSVECOMMON_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVECOMMON_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: alixggsvecommon-service
name: alixggsvecommon-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 20401
selector:
app: alixggsvecommon
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggsveinvoice
namespace: chaolai
labels:
app: alixggsveinvoice
spec:
replicas: 1
selector:
matchLabels:
app: alixggsveinvoice
template:
metadata:
labels:
app: alixggsveinvoice
spec:
restartPolicy: Always
containers:
- name: alixggsveinvoice
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:14.0.9
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: XGGSVEINVOICE_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEINVOICE_DB_NAME
- name: XGGSVEINVOICE_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEINVOICE_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: alixggsveinvoice-service
name: alixggsveinvoice-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 20701
selector:
app: alixggsveinvoice
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggsvemerchant
namespace: chaolai
labels:
app: alixggsvemerchant
spec:
replicas: 1
selector:
matchLabels:
app: alixggsvemerchant
template:
metadata:
labels:
app: alixggsvemerchant
spec:
restartPolicy: Always
containers:
- name: alixggsvemerchant
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:12.0.1
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: XGGSVEMERCHANT_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEMERCHANT_DB_NAME
- name: XGGSVEMERCHANT_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEMERCHANT_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: alixggsvemerchant-service
name: alixggsvemerchant-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 20501
selector:
app: alixggsvemerchant
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggsveorder
namespace: chaolai
labels:
app: alixggsveorder
spec:
replicas: 1
selector:
matchLabels:
app: alixggsveorder
template:
metadata:
labels:
app: alixggsveorder
spec:
restartPolicy: Always
containers:
- name: igirl
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.21
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: XGGSVEORDER_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEORDER_DB_NAME
- name: XGGSVEORDER_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEORDER_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: alixggsveorder-service
name: alixggsveorder-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 20601
selector:
app: alixggsveorder
apiVersion: apps/v1
kind: Deployment
metadata:
name: alixggsveuc
namespace: chaolai
labels:
app: alixggsveuc
spec:
replicas: 1
selector:
matchLabels:
app: alixggsveuc
template:
metadata:
labels:
app: alixggsveuc
spec:
restartPolicy: Always
containers:
- name: igirl
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:21.0.9
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: XGGSVEUC_DB_NAME
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEUC_DB_NAME
- name: XGGSVEUC_REDIS_DB
valueFrom:
configMapKeyRef:
name: zhichan-config
key: ALIXGGSVEUC_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: alixggsveuc-service
name: alixggsveuc-service
namespace: chaolai
spec:
type: NodePort
ports:
- port: 80
targetPort: 80
nodePort: 21401
selector:
app: alixggsveuc
......@@ -134,6 +134,24 @@ spec:
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: alixggadmin-ingress
namespace: chaolai
spec:
rules:
- host: ali-admin.gongsibao.com
http:
paths:
- path: /
backend:
serviceName: alixggadmin-service
servicePort: 80
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
......@@ -171,6 +189,23 @@ spec:
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: alixggdeliver-ingress
namespace: chaolai
spec:
rules:
- host: ali-deliver.gongsibao.com
http:
paths:
- path: /
backend:
serviceName: alixggdeliver-service
servicePort: 80
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: xggweb-ingress
namespace: chaolai
spec:
......
......@@ -18,7 +18,7 @@ spec:
restartPolicy: Always
containers:
- name: xggadmin
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.29
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.30
imagePullPolicy: IfNotPresent
ports:
- containerPort: 80
......
......@@ -18,7 +18,7 @@ spec:
restartPolicy: Always
containers:
- name: xggdeliver
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:19.0.15
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:19.0.16
imagePullPolicy: IfNotPresent
ports:
- containerPort: 80
......
......@@ -18,7 +18,7 @@ spec:
restartPolicy: Always
containers:
- name: xggsvecommon
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:11.0.9
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:11.0.10
imagePullPolicy: IfNotPresent
ports:
- containerPort: 80
......
......@@ -18,7 +18,7 @@ spec:
restartPolicy: Always
containers:
- name: igirl
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.19
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.21
imagePullPolicy: IfNotPresent
ports:
- containerPort: 80
......
......@@ -54,9 +54,9 @@ data:
XGGADMIN_DB_NAME: xgg
XGGADMIN_REDIS_DB: "3"
XGGSAASPLATFORM_DB_NAME: xgg
XGGSAASPLATFORM_REDIS_DB: "6"
XGGSAASPLATFORM_REDIS_DB: "3"
XGGSAASMERCHANT_DB_NAME: xgg
XGGSAASMERCHANT_REDIS_DB: "6"
XGGSAASMERCHANT_REDIS_DB: "3"
XGGPC_DB_NAME: xgg-pc
XGGPC_REDIS_DB: "3"
XGGSVECOMMON_DB_NAME: xgg-common
......@@ -91,4 +91,18 @@ data:
CENTER_CHANNEL_DB_NAME: igirl_api
CENTER_CHANNEL_REDIS_DB: "8"
CENTER_ORDER_DB_NAME: center_order
CENTER_ORDER_REDIS_DB: "9"
CENTER_ORDER_REDIS_DB: "9"
ALIXGGADMIN_DB_NAME: ali-xgg
ALIXGGADMIN_REDIS_DB: "3"
ALIXGGDELIVER_DB_NAME: ali-xgg
ALIXGGDELIVER_REDIS_DB: "3"
ALIXGGSVECOMMON_DB_NAME: ali-xgg-common
ALIXGGSVECOMMON_REDIS_DB: "3"
ALIXGGSVEMERCHANT_DB_NAME: ali-xgg-merchant
ALIXGGSVEMERCHANT_REDIS_DB: "3"
ALIXGGSVEORDER_DB_NAME: ali-xgg-order
ALIXGGSVEORDER_REDIS_DB: "3"
ALIXGGSVEINVOICE_DB_NAME: ali-xgg-invoice
ALIXGGSVEINVOICE_REDIS_DB: "3"
ALIXGGSVEUC_DB_NAME: ali-xgg-uc
ALIXGGSVEUC_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