diff --git a/openvswitch/Chart.yaml b/openvswitch/Chart.yaml index c38845977..f5e4f57e4 100644 --- a/openvswitch/Chart.yaml +++ b/openvswitch/Chart.yaml @@ -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: diff --git a/openvswitch/templates/daemonset.yaml b/openvswitch/templates/daemonset.yaml index 0caa31f3d..3a66fa519 100644 --- a/openvswitch/templates/daemonset.yaml +++ b/openvswitch/templates/daemonset.yaml @@ -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: diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml index f967c753e..01aa93d3b 100644 --- a/openvswitch/values.yaml +++ b/openvswitch/values.yaml @@ -37,6 +37,8 @@ labels: node_selector_value: enabled pod: + tini: + enabled: true tolerations: openvswitch: enabled: false diff --git a/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml b/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml index 17929c3bb..c489216e0 100644 --- a/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml +++ b/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml @@ -21,4 +21,6 @@ conf: hugepages_mountpath: /dev/hugepages vhostuser_socket_dir: vhostuser socket_memory: 512 + lcore_mask: 0x1 + pmd_cpu_mask: 0x4 ... diff --git a/releasenotes/notes/openvswitch.yaml b/releasenotes/notes/openvswitch.yaml index 8f3dab5ae..4b5ce9394 100644 --- a/releasenotes/notes/openvswitch.yaml +++ b/releasenotes/notes/openvswitch.yaml @@ -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 ...