|
@@ -18,12 +18,18 @@ spec:
|
|
|
app: offline-process-charge-callback
|
|
|
spec:
|
|
|
terminationGracePeriodSeconds: 180
|
|
|
- dnsPolicy: ClusterFirstWithHostNet
|
|
|
+ dnsPolicy: "None"
|
|
|
dnsConfig:
|
|
|
nameservers:
|
|
|
- 223.5.5.5
|
|
|
- 10.26.22.50
|
|
|
- - 10.26.22.150
|
|
|
+ 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
|
|
@@ -34,21 +40,21 @@ spec:
|
|
|
mountPath: /data
|
|
|
#nodeSelector:
|
|
|
# app.touchrs: touchrs
|
|
|
-# affinity:
|
|
|
-# podAntiAffinity:
|
|
|
-# preferredDuringSchedulingIgnoredDuringExecution:
|
|
|
-# - weight: 100
|
|
|
-# podAffinityTerm:
|
|
|
-# labelSelector:
|
|
|
-# matchExpressions:
|
|
|
-# - key: app
|
|
|
-# operator: In
|
|
|
-# values:
|
|
|
-# - offline-process-charge-callback
|
|
|
-# topologyKey: kubernetes.io/hostname
|
|
|
+ affinity:
|
|
|
+ podAntiAffinity:
|
|
|
+ preferredDuringSchedulingIgnoredDuringExecution:
|
|
|
+ - weight: 100
|
|
|
+ podAffinityTerm:
|
|
|
+ labelSelector:
|
|
|
+ matchExpressions:
|
|
|
+ - key: app
|
|
|
+ operator: In
|
|
|
+ values:
|
|
|
+ - offline-process-charge-callback
|
|
|
+ topologyKey: kubernetes.io/hostname
|
|
|
containers:
|
|
|
- name: offline-process-charge-callback
|
|
|
- image: hub.evbj.easou.com/pro/offline-process-charge-callback:r180714
|
|
|
+ image: hub.evbj.easou.com/pro/offline-process-charge-callback:r181301
|
|
|
imagePullPolicy: IfNotPresent
|
|
|
env:
|
|
|
- name: MY_NODE_NAME
|
|
@@ -100,29 +106,29 @@ 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-charge-callback
|
|
|
-# 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-charge-callback
|
|
|
+ items:
|
|
|
+ - key: filebeat.yml
|
|
|
+ path: filebeat.yml
|
|
|
|
|
|
volumeClaimTemplates:
|
|
|
- metadata:
|
|
|
name: volume
|
|
|
spec:
|
|
|
accessModes: [ "ReadWriteOnce" ]
|
|
|
- storageClassName: ceph-block
|
|
|
+ storageClassName: rbd
|
|
|
resources:
|
|
|
requests:
|
|
|
storage: 100Gi
|
|
@@ -143,24 +149,22 @@ spec:
|
|
|
selector:
|
|
|
app: offline-process-charge-callback
|
|
|
---
|
|
|
-apiVersion: networking.k8s.io/v1
|
|
|
+apiVersion: extensions/v1beta1
|
|
|
kind: Ingress
|
|
|
metadata:
|
|
|
name: offline-process-charge-callback-ingress
|
|
|
namespace: pro
|
|
|
+ annotations:
|
|
|
+ kubernetes.io/ingress.class: nginx
|
|
|
spec:
|
|
|
rules:
|
|
|
- host: pro-offline-process-charge-callback.ieasou.cn
|
|
|
http:
|
|
|
paths:
|
|
|
- path: /
|
|
|
- pathType: Prefix
|
|
|
backend:
|
|
|
- service:
|
|
|
- name: offline-process-charge-callback-svc
|
|
|
- port:
|
|
|
- number: 8080
|
|
|
- ingressClassName: nginx
|
|
|
+ serviceName: offline-process-charge-callback-svc
|
|
|
+ servicePort: 80
|
|
|
---
|
|
|
apiVersion: v1
|
|
|
kind: ConfigMap
|