Skip to content

Commit 7f3b1e8

Browse files
zbb88888zbb88888
committed
suuport user custom log location (#3186)
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
1 parent 188c252 commit 7f3b1e8

14 files changed

+65
-61
lines changed

‎charts/templates/central-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ spec:
143143
path: /etc/origin/ovn
144144
- name: host-log-ovs
145145
hostPath:
146-
path: /var/log/openvswitch
146+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
147147
- name: host-log-ovn
148148
hostPath:
149-
path: /var/log/ovn
149+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
150150
- name: localtime
151151
hostPath:
152152
path: /etc/localtime

‎charts/templates/controller-deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ spec:
167167
path: /etc/localtime
168168
- name: kube-ovn-log
169169
hostPath:
170-
path: /var/log/kube-ovn
170+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
171171
- name: kube-ovn-tls
172172
secret:
173173
optional: true

‎charts/templates/monitor-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ spec:
124124
path: /etc/origin/ovn
125125
- name: host-log-ovn
126126
hostPath:
127-
path: /var/log/ovn
127+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
128128
- name: localtime
129129
hostPath:
130130
path: /etc/localtime
@@ -134,4 +134,4 @@ spec:
134134
secretName: kube-ovn-tls
135135
- name: kube-ovn-log
136136
hostPath:
137-
path: /var/log/kube-ovn
137+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn

‎charts/templates/ovn-dpdk-ds.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ spec:
146146
path: /etc/origin/ovn
147147
- name: host-log-ovs
148148
hostPath:
149-
path: /var/log/openvswitch
149+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
150150
- name: host-log-ovn
151151
hostPath:
152-
path: /var/log/ovn
152+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
153153
- name: localtime
154154
hostPath:
155155
path: /etc/localtime

‎charts/templates/ovncni-ds.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,16 @@ spec:
192192
path: /var/run/dbus
193193
- name: kube-ovn-log
194194
hostPath:
195-
path: /var/log/kube-ovn
195+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
196196
- name: localtime
197197
hostPath:
198198
path: /etc/localtime
199199
- name: host-log-ovs
200200
hostPath:
201-
path: /var/log/openvswitch
201+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
202202
- name: host-log-ovn
203203
hostPath:
204-
path: /var/log/ovn
204+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
205205
- name: tmp
206206
hostPath:
207207
path: /tmp

‎charts/templates/ovsovn-ds.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ spec:
186186
path: /etc/origin/ovn
187187
- name: host-log-ovs
188188
hostPath:
189-
path: /var/log/openvswitch
189+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
190190
- name: host-log-ovn
191191
hostPath:
192-
path: /var/log/ovn
192+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
193193
- name: localtime
194194
hostPath:
195195
path: /etc/localtime

‎charts/templates/pinger-ds.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ spec:
113113
path: /etc/origin/openvswitch
114114
- name: host-log-ovs
115115
hostPath:
116-
path: /var/log/openvswitch
116+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
117117
- name: kube-ovn-log
118118
hostPath:
119-
path: /var/log/kube-ovn
119+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
120120
- name: host-log-ovn
121121
hostPath:
122-
path: /var/log/ovn
122+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
123123
- name: localtime
124124
hostPath:
125125
path: /etc/localtime

‎charts/templates/upgrade-ovs-ovn.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ spec:
137137
volumes:
138138
- name: kube-ovn-log
139139
hostPath:
140-
path: /var/log/kube-ovn
140+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
141141
{{ end }}
142142
{{ end }}

‎charts/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ cni_conf:
110110

111111
kubelet_conf:
112112
KUBELET_DIR: "/var/lib/kubelet"
113+
114+
log_conf:
115+
LOG_DIR: "/var/log"
113116

114117
imagePullSecrets: []
115118
nameOverride: ""

‎dist/images/install.sh

+20-19
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ ENABLE_TPROXY=${ENABLE_TPROXY:-false}
3838
DEBUG_WRAPPER=${DEBUG_WRAPPER:-}
3939

4040
KUBELET_DIR=${KUBELET_DIR:-/var/lib/kubelet}
41+
LOG_DIR=${LOG_DIR:-/var/log}
4142

4243
CNI_CONF_DIR="/etc/cni/net.d"
4344
CNI_BIN_DIR="/opt/cni/bin"
@@ -3303,10 +3304,10 @@ spec:
33033304
path: /etc/origin/ovn
33043305
- name: host-log-ovs
33053306
hostPath:
3306-
path: /var/log/openvswitch
3307+
path: $LOG_DIR/openvswitch
33073308
- name: host-log-ovn
33083309
hostPath:
3309-
path: /var/log/ovn
3310+
path: $LOG_DIR/ovn
33103311
- name: localtime
33113312
hostPath:
33123313
path: /etc/localtime
@@ -3462,10 +3463,10 @@ spec:
34623463
path: /etc/origin/ovn
34633464
- name: host-log-ovs
34643465
hostPath:
3465-
path: /var/log/openvswitch
3466+
path: $LOG_DIR/openvswitch
34663467
- name: host-log-ovn
34673468
hostPath:
3468-
path: /var/log/ovn
3469+
path: $LOG_DIR/ovn
34693470
- name: host-config-ovs
34703471
hostPath:
34713472
path: /opt/ovs-config
@@ -3641,10 +3642,10 @@ spec:
36413642
path: /etc/origin/ovn
36423643
- name: host-log-ovs
36433644
hostPath:
3644-
path: /var/log/openvswitch
3645+
path: $LOG_DIR/openvswitch
36453646
- name: host-log-ovn
36463647
hostPath:
3647-
path: /var/log/ovn
3648+
path: $LOG_DIR/ovn
36483649
- name: localtime
36493650
hostPath:
36503651
path: /etc/localtime
@@ -3738,9 +3739,9 @@ spec:
37383739
name: host-config-openvswitch
37393740
- mountPath: /etc/ovn
37403741
name: host-config-ovn
3741-
- mountPath: /var/log/openvswitch
3742+
- mountPath: $LOG_DIR/openvswitch
37423743
name: host-log-ovs
3743-
- mountPath: /var/log/ovn
3744+
- mountPath: $LOG_DIR/ovn
37443745
name: host-log-ovn
37453746
- mountPath: /etc/localtime
37463747
name: localtime
@@ -3808,10 +3809,10 @@ spec:
38083809
path: /etc/origin/ovn
38093810
- name: host-log-ovs
38103811
hostPath:
3811-
path: /var/log/openvswitch
3812+
path: $LOG_DIR/openvswitch
38123813
- name: host-log-ovn
38133814
hostPath:
3814-
path: /var/log/ovn
3815+
path: $LOG_DIR/ovn
38153816
- name: localtime
38163817
hostPath:
38173818
path: /etc/localtime
@@ -3984,7 +3985,7 @@ spec:
39843985
path: /etc/localtime
39853986
- name: kube-ovn-log
39863987
hostPath:
3987-
path: /var/log/kube-ovn
3988+
path: $LOG_DIR/kube-ovn
39883989
- name: kube-ovn-tls
39893990
secret:
39903991
optional: true
@@ -4170,13 +4171,13 @@ spec:
41704171
path: /var/run/dbus
41714172
- name: host-log-ovs
41724173
hostPath:
4173-
path: /var/log/openvswitch
4174+
path: $LOG_DIR/openvswitch
41744175
- name: kube-ovn-log
41754176
hostPath:
4176-
path: /var/log/kube-ovn
4177+
path: $LOG_DIR/kube-ovn
41774178
- name: host-log-ovn
41784179
hostPath:
4179-
path: /var/log/ovn
4180+
path: $LOG_DIR/ovn
41804181
- name: localtime
41814182
hostPath:
41824183
path: /etc/localtime
@@ -4288,13 +4289,13 @@ spec:
42884289
path: /etc/origin/openvswitch
42894290
- name: host-log-ovs
42904291
hostPath:
4291-
path: /var/log/openvswitch
4292+
path: $LOG_DIR/openvswitch
42924293
- name: kube-ovn-log
42934294
hostPath:
4294-
path: /var/log/kube-ovn
4295+
path: $LOG_DIR/kube-ovn
42954296
- name: host-log-ovn
42964297
hostPath:
4297-
path: /var/log/ovn
4298+
path: $LOG_DIR/ovn
42984299
- name: localtime
42994300
hostPath:
43004301
path: /etc/localtime
@@ -4429,7 +4430,7 @@ spec:
44294430
path: /etc/origin/ovn
44304431
- name: host-log-ovn
44314432
hostPath:
4432-
path: /var/log/ovn
4433+
path: $LOG_DIR/ovn
44334434
- name: localtime
44344435
hostPath:
44354436
path: /etc/localtime
@@ -4439,7 +4440,7 @@ spec:
44394440
secretName: kube-ovn-tls
44404441
- name: kube-ovn-log
44414442
hostPath:
4442-
path: /var/log/kube-ovn
4443+
path: $LOG_DIR/kube-ovn
44434444
---
44444445
kind: Service
44454446
apiVersion: v1

‎yamls/kube-ovn-dual-stack.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
path: /etc/localtime
131131
- name: kube-ovn-log
132132
hostPath:
133-
path: /var/log/kube-ovn
133+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
134134
- name: kube-ovn-tls
135135
secret:
136136
optional: true
@@ -314,13 +314,13 @@ spec:
314314
path: /var/run/dbus
315315
- name: host-log-ovs
316316
hostPath:
317-
path: /var/log/openvswitch
317+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
318318
- name: kube-ovn-log
319319
hostPath:
320-
path: /var/log/kube-ovn
320+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
321321
- name: host-log-ovn
322322
hostPath:
323-
path: /var/log/ovn
323+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
324324
- name: localtime
325325
hostPath:
326326
path: /etc/localtime
@@ -432,13 +432,13 @@ spec:
432432
path: /etc/origin/openvswitch
433433
- name: host-log-ovs
434434
hostPath:
435-
path: /var/log/openvswitch
435+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
436436
- name: kube-ovn-log
437437
hostPath:
438-
path: /var/log/kube-ovn
438+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
439439
- name: host-log-ovn
440440
hostPath:
441-
path: /var/log/ovn
441+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
442442
- name: localtime
443443
hostPath:
444444
path: /etc/localtime
@@ -573,7 +573,7 @@ spec:
573573
path: /etc/origin/ovn
574574
- name: host-log-ovn
575575
hostPath:
576-
path: /var/log/ovn
576+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
577577
- name: localtime
578578
hostPath:
579579
path: /etc/localtime
@@ -583,7 +583,7 @@ spec:
583583
secretName: kube-ovn-tls
584584
- name: kube-ovn-log
585585
hostPath:
586-
path: /var/log/kube-ovn
586+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
587587
---
588588
kind: Service
589589
apiVersion: v1

‎yamls/kube-ovn-ipv6.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
path: /etc/localtime
131131
- name: kube-ovn-log
132132
hostPath:
133-
path: /var/log/kube-ovn
133+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
134134
- name: kube-ovn-tls
135135
secret:
136136
optional: true
@@ -314,13 +314,13 @@ spec:
314314
path: /var/run/dbus
315315
- name: host-log-ovs
316316
hostPath:
317-
path: /var/log/openvswitch
317+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
318318
- name: kube-ovn-log
319319
hostPath:
320-
path: /var/log/kube-ovn
320+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
321321
- name: host-log-ovn
322322
hostPath:
323-
path: /var/log/ovn
323+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
324324
- name: localtime
325325
hostPath:
326326
path: /etc/localtime
@@ -432,13 +432,13 @@ spec:
432432
path: /etc/origin/openvswitch
433433
- name: host-log-ovs
434434
hostPath:
435-
path: /var/log/openvswitch
435+
path: {{ .Values.log_conf.LOG_DIR }}/openvswitch
436436
- name: kube-ovn-log
437437
hostPath:
438-
path: /var/log/kube-ovn
438+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
439439
- name: host-log-ovn
440440
hostPath:
441-
path: /var/log/ovn
441+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
442442
- name: localtime
443443
hostPath:
444444
path: /etc/localtime
@@ -573,7 +573,7 @@ spec:
573573
path: /etc/origin/ovn
574574
- name: host-log-ovn
575575
hostPath:
576-
path: /var/log/ovn
576+
path: {{ .Values.log_conf.LOG_DIR }}/ovn
577577
- name: localtime
578578
hostPath:
579579
path: /etc/localtime
@@ -583,7 +583,7 @@ spec:
583583
secretName: kube-ovn-tls
584584
- name: kube-ovn-log
585585
hostPath:
586-
path: /var/log/kube-ovn
586+
path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
587587
---
588588
kind: Service
589589
apiVersion: v1

0 commit comments

Comments
 (0)