Commit e2b627a1 by 王昆

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

parents 5fbcbf58 080b2fd1
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/k8syml.iml" filepath="$PROJECT_DIR$/.idea/k8syml.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
apiVersion: batch/v2alpha1
kind: CronJob
metadata:
name: taskalirpcagainpush
namespace: job-tasks
spec:
schedule: "*/10 * * * *"
jobTemplate:
spec:
template:
spec:
restartPolicy: OnFailure
containers:
- name: taskalirpcagainpush
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.3.0
imagePullPolicy: IfNotPresent
env:
- name: TZ
value: Asia/Shanghai
- name: LANG
value: zh_CN.UTF-8
- name: TASK_NAME
value: tm.taskalirpcagainpush
- name: TASK_PARAM
value: hello
- name: APP_ENV
valueFrom:
configMapKeyRef:
name: task-config
key: APP_ENV
- name: TASK_PORT
valueFrom:
configMapKeyRef:
name: task-config
key: TASK_PORT
- name: TASK_REDIS_DB
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_DB
- name: REDIS_HOST
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_HOST
- name: REDIS_PORT
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_PORT
- name: REDIS_PWD
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_PWD
apiVersion: batch/v2alpha1
kind: CronJob
metadata:
name: taskalitmupdate
namespace: job-tasks
spec:
schedule: "*/10 * * * *"
jobTemplate:
spec:
template:
spec:
restartPolicy: OnFailure
containers:
- name: taskalitmupdate
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:181.4.1
imagePullPolicy: IfNotPresent
env:
- name: TZ
value: Asia/Shanghai
- name: LANG
value: zh_CN.UTF-8
- name: TASK_NAME
value: tm.taskalitmupdate
- name: TASK_PARAM
value: hello
- name: APP_ENV
valueFrom:
configMapKeyRef:
name: task-config
key: APP_ENV
- name: TASK_PORT
valueFrom:
configMapKeyRef:
name: task-config
key: TASK_PORT
- name: TASK_REDIS_DB
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_DB
- name: REDIS_HOST
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_HOST
- name: REDIS_PORT
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_PORT
- name: REDIS_PWD
valueFrom:
configMapKeyRef:
name: task-config
key: FK_REDIS_PWD
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: alixggsveorder - name: alixggsveorder
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.21 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.23
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
...@@ -1461,6 +1461,21 @@ spec: ...@@ -1461,6 +1461,21 @@ spec:
servicePort: 80 servicePort: 80
--- ---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: caishui-qifu-ingress
namespace: chaolai
spec:
rules:
- host: caishui.qifu.gongsibao.com
http:
paths:
- path: /
backend:
serviceName: center-channel-service
servicePort: 80
---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: bpoweb - name: bpoweb
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.0.78 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:8.0.81
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: entprofile - name: entprofile
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:179.1.7 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:179.1.14
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: laowubao - name: laowubao
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:10.0.35 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:10.0.39
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: xggadmin - name: xggadmin
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.36 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:16.0.39
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: xggsveorder - name: xggsveorder
image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.22 image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:13.0.24
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80
......
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