Skip to content

A
argoproj
提交 b9ace63a authored 作者: 李群's avatar 李群
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 905206bf 99e9b5f8
隐藏空白字符变更
内嵌 并排
正在显示 包含 577 行增加 和 15 行删除
pro/billboard-ui/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: billboard-ui
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/billboard-ui:pro-5-20220614"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/billboard-ui:pro-6-20220731"
imagePullPolicy: Always
env:
- name: APPNAME
......
pro/claim-settlement-vue/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: claim-settlement-vue
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/claim-settlement-vue:pro-7-20220716"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/claim-settlement-vue:pro-11-20220801"
imagePullPolicy: Always
env:
- name: APPNAME
......
pro/creditinsurance-vue/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: creditinsurance-vue
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance-vue:pro-7-20220716"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance-vue:pro-8-20220801"
imagePullPolicy: Always
env:
- name: APPNAME
......
pro/elevator/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: elevator
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/elevator:pro-4-20220628"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/elevator:pro-7-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
......
pro/gy-bus/install.yaml 0 → 100644
浏览文件 @ b9ace63a
# Source: hede-java/templates/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: cm-gy-bus
data:
filebeat.yml: |-
name: '${APPNAME}'
filebeat.inputs:
- type: log
paths:
- /logfile/debug.log
- /logfile/*/debug.log
document_type: '${RUNENV}_${APPNAME}_debug'
fields:
level: debug
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_debug'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
- type: log
paths:
- /logfile/info.log
- /logfile/*/info.log
document_type: '${RUNENV}_${APPNAME}_info'
fields:
level: info
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_info'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
- type: log
paths:
- /logfile/error.log
- /logfile/*/error.log
document_type: '${RUNENV}_${APPNAME}_error'
fields:
level: error
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_error'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
processors:
# - add_host_metadata: ~
- add_locale:
format: abbreviation
# filebeat.modules:
# - module: system
# syslog:
# var.convert_timezone: true
output.kafka:
enabled: true
# initial brokers for reading cluster metadata
hosts: ["log-kafka-0.log-kafka-headless.hede-log-system.svc.cluster.local:9092"]
# message topic selection + partitioning
# topic: '%{[fields.log_topic]}'
topic: 'filebeat'
partition.round_robin:
reachable_only: false
required_acks: 1
compression: gzip
max_message_bytes: 1000000
output.logstash:
enabled: false
hosts: ["kafka.hedejj.com:55044"]
---
# Source: hede-java/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: svc-gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
ports:
- port: 8080
targetPort: http
protocol: TCP
name: http
selector:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
---
# Source: hede-java/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
template:
metadata:
labels:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
spec:
imagePullSecrets:
- name: hub.aliyun
serviceAccountName: default
containers:
- name: gy-bus
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/gy-bus:pro-1-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
value: gy-bus
- name: APP_LOG_PATH
value: /app/logs
- name: JAVA_OPTS
value: -server -Xms1024m -Xmx4096m -XX:PermSize=512m -XX:MaxPermSize=2048m -Dfile.encoding=utf-8
-Duser.timezone=GMT+8
- name: IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: MY_NODE_NAME
valueFrom:
fieldRef: {fieldPath: spec.nodeName}
- name: MY_POD_NAME
valueFrom:
fieldRef: {fieldPath: metadata.name}
- name: MY_POD_NAMESPACE
valueFrom:
fieldRef: {fieldPath: metadata.namespace}
- name: MY_POD_IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: HOST_IP
valueFrom:
fieldRef: {fieldPath: status.hostIP}
- name: MY_POD_SERVICE_ACCOUNT
valueFrom:
fieldRef: {fieldPath: spec.serviceAccountName}
- name: MY_APP_NAME
valueFrom:
fieldRef: {fieldPath: spec.serviceAccountName}
envFrom:
- configMapRef: {name: env-config}
livenessProbe:
failureThreshold: 3
httpGet:
path: /heartBest
port: http
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
readinessProbe:
failureThreshold: 3
httpGet:
path: /heartBest
port: http
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
ports:
- containerPort: 8080
name: http
protocol: TCP
volumeMounts:
- mountPath: /app/logs
name: logdata
resources:
{}
- name: filebeat
env:
- name: APPNAME
value: gy-bus
- name: LOGTYPE
value: LOGBACK
- name: MY_POD_IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: MY_POD_NAME
valueFrom:
fieldRef: {fieldPath: metadata.name}
envFrom:
- configMapRef: {name: env-config}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/filebeat:7.17.0"
imagePullPolicy: Always
volumeMounts:
- name: logdata
mountPath: /logfile
- name: configurations
mountPath: /usr/share/filebeat/filebeat.yml
subPath: filebeat.yml
readOnly: true
volumes:
- name: logdata
emptyDir: {}
- name: configurations
configMap:
name: cm-gy-bus
defaultMode: 420
items:
- key: filebeat.yml
path: filebeat.yml
---
# Source: hede-java/templates/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ingress-gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
kubernetes.io/ingress.class: ack-nginx-pro
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "900"
nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
spec:
tls:
- hosts:
- "gy.hedejj.com"
secretName: hede-prod
rules:
- host: "gy.hedejj.com"
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: svc-gy-bus
port:
number: 8080
pro/insurance-service/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: insurance-service
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/insurance-service:pro-17-20220722"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/insurance-service:pro-18-20220809"
imagePullPolicy: Always
env:
- name: APPNAME
......
pro/policy-manager/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: policy-manager
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/policy-manager:pro-94-20220727"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/policy-manager:pro-107-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/billboard-ui/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: billboard-ui
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/billboard-ui:uat-5-20220524"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/billboard-ui:uat-6-20220731"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/claim-settlement-vue/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: claim-settlement-vue
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/claim-settlement-vue:uat-20-20220610"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/claim-settlement-vue:uat-22-20220801"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/common-h5/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: common-h5
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/common-h5:uat-17-20220715"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/common-h5:uat-18-20220728"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/creditinsurance-vue/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: creditinsurance-vue
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance-vue:uat-11-20220526"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance-vue:uat-12-20220801"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/creditinsurance/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: creditinsurance
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance:uat-6-20220721"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/creditinsurance:uat-38-20220812"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/elevator/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: elevator
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/elevator:uat-20-20220620"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/elevator:uat-24-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/gy-bus/install.yaml 0 → 100644
浏览文件 @ b9ace63a
# Source: hede-java/templates/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: cm-gy-bus
data:
filebeat.yml: |-
name: '${APPNAME}'
filebeat.inputs:
- type: log
paths:
- /logfile/debug.log
- /logfile/*/debug.log
document_type: '${RUNENV}_${APPNAME}_debug'
fields:
level: debug
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_debug'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
- type: log
paths:
- /logfile/info.log
- /logfile/*/info.log
document_type: '${RUNENV}_${APPNAME}_info'
fields:
level: info
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_info'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
- type: log
paths:
- /logfile/error.log
- /logfile/*/error.log
document_type: '${RUNENV}_${APPNAME}_error'
fields:
level: error
review: 1
runenv: '${RUNENV}'
pod_name: '${MY_POD_NAME}'
POD_IP: '${MY_POD_IP}'
tags: '${RUNENV}_${APPNAME}_error'
app_name: '${APPNAME}'
log_type: '${LOGTYPE}'
fields_under_root: false
multiline.pattern: '^\[0-9]{4}-[0-9]{2}-[0-9]{2}'
multiline.negate: true
multiline.match: after
processors:
# - add_host_metadata: ~
- add_locale:
format: abbreviation
# filebeat.modules:
# - module: system
# syslog:
# var.convert_timezone: true
output.kafka:
enabled: true
# initial brokers for reading cluster metadata
hosts: ["log-kafka-0.log-kafka-headless.hede-log-system.svc.cluster.local:9092"]
# message topic selection + partitioning
# topic: '%{[fields.log_topic]}'
topic: 'filebeat'
partition.round_robin:
reachable_only: false
required_acks: 1
compression: gzip
max_message_bytes: 1000000
output.logstash:
enabled: false
hosts: ["kafka.hedejj.com:55044"]
---
# Source: hede-java/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: svc-gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
ports:
- port: 8080
targetPort: http
protocol: TCP
name: http
selector:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
---
# Source: hede-java/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
template:
metadata:
labels:
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
spec:
imagePullSecrets:
- name: hub.aliyun
serviceAccountName: default
containers:
- name: gy-bus
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/gy-bus:uat-2-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
value: gy-bus
- name: APP_LOG_PATH
value: /app/logs
- name: JAVA_OPTS
value: -server -Xms1024m -Xmx4096m -XX:PermSize=512m -XX:MaxPermSize=2048m -Dfile.encoding=utf-8
-Duser.timezone=GMT+8
- name: IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: MY_NODE_NAME
valueFrom:
fieldRef: {fieldPath: spec.nodeName}
- name: MY_POD_NAME
valueFrom:
fieldRef: {fieldPath: metadata.name}
- name: MY_POD_NAMESPACE
valueFrom:
fieldRef: {fieldPath: metadata.namespace}
- name: MY_POD_IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: HOST_IP
valueFrom:
fieldRef: {fieldPath: status.hostIP}
- name: MY_POD_SERVICE_ACCOUNT
valueFrom:
fieldRef: {fieldPath: spec.serviceAccountName}
- name: MY_APP_NAME
valueFrom:
fieldRef: {fieldPath: spec.serviceAccountName}
envFrom:
- configMapRef: {name: env-config}
livenessProbe:
failureThreshold: 3
httpGet:
path: /heartBest
port: http
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
readinessProbe:
failureThreshold: 3
httpGet:
path: /heartBest
port: http
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
ports:
- containerPort: 8080
name: http
protocol: TCP
volumeMounts:
- mountPath: /app/logs
name: logdata
resources:
{}
- name: filebeat
env:
- name: APPNAME
value: gy-bus
- name: LOGTYPE
value: LOGBACK
- name: MY_POD_IP
valueFrom:
fieldRef: {fieldPath: status.podIP}
- name: MY_POD_NAME
valueFrom:
fieldRef: {fieldPath: metadata.name}
envFrom:
- configMapRef: {name: env-config}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/filebeat:7.17.0"
imagePullPolicy: Always
volumeMounts:
- name: logdata
mountPath: /logfile
- name: configurations
mountPath: /usr/share/filebeat/filebeat.yml
subPath: filebeat.yml
readOnly: true
volumes:
- name: logdata
emptyDir: {}
- name: configurations
configMap:
name: cm-gy-bus
defaultMode: 420
items:
- key: filebeat.yml
path: filebeat.yml
---
# Source: hede-java/templates/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ingress-gy-bus
labels:
helm.sh/chart: hede-java-0.0.1
app.kubernetes.io/name: hede-java
app.kubernetes.io/instance: gy-bus
app.kubernetes.io/version: "1.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
kubernetes.io/ingress.class: ack-nginx
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "900"
nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
spec:
tls:
- hosts:
- "gy.test.hedejj.com"
secretName: hede-test
rules:
- host: "gy.test.hedejj.com"
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
service:
name: svc-gy-bus
port:
number: 8080
uat/home/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: home
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/home:uat-13-20220726"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/home:uat-14-20220819"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/policy-manager/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: policy-manager
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/policy-manager:uat-69-20220721"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/policy-manager:uat-71-20220811"
imagePullPolicy: Always
env:
- name: APPNAME
......
uat/rrweb-server/install.yaml
浏览文件 @ b9ace63a
......@@ -148,7 +148,7 @@ spec:
- name: rrweb-server
securityContext:
{}
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/rrweb-server:uat-32-20220727"
image: "registry-vpc.cn-beijing.aliyuncs.com/hede/rrweb-server:uat-38-20220728"
imagePullPolicy: Always
command:
- npm
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论