Updating openvswitch to run as child process
On containerd v1.7+ openvswitch restarts when containerd is restarted. To prevent this add tini and run OVS as a child process. Change-Id: I382dc2db12ca387b6d32304315bbee35d8e00562
This commit is contained in:
parent
b5b9590e42
commit
ec11928422
@ -15,7 +15,7 @@ apiVersion: v1
|
||||
appVersion: v1.0.0
|
||||
description: OpenStack-Helm OpenVSwitch
|
||||
name: openvswitch
|
||||
version: 0.1.23
|
||||
version: 0.1.24
|
||||
home: http://openvswitch.org
|
||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
||||
sources:
|
||||
|
@ -168,9 +168,19 @@ It should be handled through lcore and pmd core masks. */}}
|
||||
# successfully before its marked as ready
|
||||
{{ dict "envAll" $envAll "component" "ovs" "container" "ovs_vswitch" "type" "liveness" "probeTemplate" (include "ovsvswitchlivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
||||
{{ dict "envAll" $envAll "component" "ovs" "container" "ovs_vswitch" "type" "readiness" "probeTemplate" (include "ovsvswitchreadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
||||
{{- if .Values.pod.tini.enabled }}
|
||||
command:
|
||||
- /tini
|
||||
- -s
|
||||
- --
|
||||
args:
|
||||
- /tmp/openvswitch-vswitchd.sh
|
||||
- start
|
||||
{{- else }}
|
||||
command:
|
||||
- /tmp/openvswitch-vswitchd.sh
|
||||
- start
|
||||
{{- end }}
|
||||
lifecycle:
|
||||
postStart:
|
||||
exec:
|
||||
|
@ -37,6 +37,8 @@ labels:
|
||||
node_selector_value: enabled
|
||||
|
||||
pod:
|
||||
tini:
|
||||
enabled: true
|
||||
tolerations:
|
||||
openvswitch:
|
||||
enabled: false
|
||||
|
@ -21,4 +21,6 @@ conf:
|
||||
hugepages_mountpath: /dev/hugepages
|
||||
vhostuser_socket_dir: vhostuser
|
||||
socket_memory: 512
|
||||
lcore_mask: 0x1
|
||||
pmd_cpu_mask: 0x4
|
||||
...
|
||||
|
@ -24,4 +24,5 @@ openvswitch:
|
||||
- 0.1.21 Add overrides for dpdk
|
||||
- 0.1.22 Change hugepages size to 2M for easier configuration
|
||||
- 0.1.23 Fix rolebinding for init container
|
||||
- 0.1.24 Change ovs to run as child process of start script
|
||||
...
|
||||
|
Loading…
Reference in New Issue
Block a user