|
@@ -17,20 +17,13 @@ spec:
|
|
|
labels:
|
|
|
app: offline-process-promotion
|
|
|
spec:
|
|
|
- terminationGracePeriodSeconds: 180
|
|
|
- dnsPolicy: "None"
|
|
|
+ terminationGracePeriodSeconds: 30
|
|
|
+ dnsPolicy: None
|
|
|
dnsConfig:
|
|
|
nameservers:
|
|
|
- 223.5.5.5
|
|
|
- 10.108.30.101
|
|
|
- 10.26.22.50
|
|
|
- searches:
|
|
|
- - pro.svc.cluster.local
|
|
|
- - svc.cluster.local
|
|
|
- - cluster.local
|
|
|
- options:
|
|
|
- - name: ndots
|
|
|
- value: "5"
|
|
|
initContainers:
|
|
|
- name: init
|
|
|
image: hub.evbj.easou.com/dev/busybox
|
|
@@ -41,21 +34,21 @@ spec:
|
|
|
mountPath: /data
|
|
|
#nodeSelector:
|
|
|
# app.touchrs: touchrs
|
|
|
- affinity:
|
|
|
- podAntiAffinity:
|
|
|
- preferredDuringSchedulingIgnoredDuringExecution:
|
|
|
- - weight: 100
|
|
|
- podAffinityTerm:
|
|
|
- labelSelector:
|
|
|
- matchExpressions:
|
|
|
- - key: app
|
|
|
- operator: In
|
|
|
- values:
|
|
|
- - offline-process-promotion
|
|
|
- topologyKey: kubernetes.io/hostname
|
|
|
+# affinity:
|
|
|
+# podAntiAffinity:
|
|
|
+# preferredDuringSchedulingIgnoredDuringExecution:
|
|
|
+# - weight: 100
|
|
|
+# podAffinityTerm:
|
|
|
+# labelSelector:
|
|
|
+# matchExpressions:
|
|
|
+# - key: app
|
|
|
+# operator: In
|
|
|
+# values:
|
|
|
+# - offline-process-promotion
|
|
|
+# topologyKey: kubernetes.io/hostname
|
|
|
containers:
|
|
|
- name: offline-process-promotion
|
|
|
- image: hub.evbj.easou.com/qa/offline-process-promotion:r192231
|
|
|
+ image: hub.evbj.easou.com/qa/offline-process-promotion:r192265
|
|
|
imagePullPolicy: IfNotPresent
|
|
|
env:
|
|
|
- name: MY_NODE_NAME
|
|
@@ -107,22 +100,22 @@ spec:
|
|
|
port: 8080
|
|
|
initialDelaySeconds: 40
|
|
|
periodSeconds: 15
|
|
|
- - image: hub.evbj.easou.com/pro/filebeat:7.13.3
|
|
|
- imagePullPolicy: IfNotPresent
|
|
|
- name: filebeat
|
|
|
- volumeMounts:
|
|
|
- - name: volume #日志同时挂载在nginx和filebeat中
|
|
|
- mountPath: /data
|
|
|
- - name: filebeat-config
|
|
|
- mountPath: /usr/share/filebeat/filebeat.yml
|
|
|
- subPath: filebeat.yml
|
|
|
- volumes:
|
|
|
- - name: filebeat-config
|
|
|
- configMap:
|
|
|
- name: filebeat-config-offline-process-promotion
|
|
|
- items:
|
|
|
- - key: filebeat.yml
|
|
|
- path: filebeat.yml
|
|
|
+# - image: hub.evbj.easou.com/pro/filebeat:7.13.3
|
|
|
+# imagePullPolicy: IfNotPresent
|
|
|
+# name: filebeat
|
|
|
+# volumeMounts:
|
|
|
+# - name: volume #日志同时挂载在nginx和filebeat中
|
|
|
+# mountPath: /data
|
|
|
+# - name: filebeat-config
|
|
|
+# mountPath: /usr/share/filebeat/filebeat.yml
|
|
|
+# subPath: filebeat.yml
|
|
|
+# volumes:
|
|
|
+# - name: filebeat-config
|
|
|
+# configMap:
|
|
|
+# name: filebeat-config-offline-process-promotion
|
|
|
+# items:
|
|
|
+# - key: filebeat.yml
|
|
|
+# path: filebeat.yml
|
|
|
|
|
|
volumeClaimTemplates:
|
|
|
- metadata:
|
|
@@ -156,18 +149,18 @@ metadata:
|
|
|
name: offline-process-promotion-ingress
|
|
|
namespace: qa
|
|
|
spec:
|
|
|
- ingressClassName: nginx
|
|
|
rules:
|
|
|
- host: qa-offline-process-promotion.ieasou.cn
|
|
|
http:
|
|
|
paths:
|
|
|
- path: /
|
|
|
- pathType: ImplementationSpecific
|
|
|
+ pathType: Prefix
|
|
|
backend:
|
|
|
service:
|
|
|
name: offline-process-promotion-svc
|
|
|
port:
|
|
|
number: 8080
|
|
|
+ ingressClassName: nginx
|
|
|
---
|
|
|
apiVersion: v1
|
|
|
kind: ConfigMap
|