Bump neutron to 0.3.15
This sync asap2 patch to community work
diff --git a/charts/neutron/Chart.yaml b/charts/neutron/Chart.yaml
index f5f34be..a39d84f 100644
--- a/charts/neutron/Chart.yaml
+++ b/charts/neutron/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://opendev.org/openstack/neutron
- https://opendev.org/openstack/openstack-helm
-version: 0.3.13
+version: 0.3.15
diff --git a/charts/neutron/requirements.lock b/charts/neutron/requirements.lock
index 62d9333..e76e6ef 100644
--- a/charts/neutron/requirements.lock
+++ b/charts/neutron/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-06-29T17:37:44.246907398Z"
+generated: "2023-07-17T05:36:22.127905869Z"
diff --git a/charts/neutron/templates/configmap-bin.yaml b/charts/neutron/templates/configmap-bin.yaml
index c8e9750..fa90177 100644
--- a/charts/neutron/templates/configmap-bin.yaml
+++ b/charts/neutron/templates/configmap-bin.yaml
@@ -65,8 +65,10 @@
{{ tuple "bin/_neutron-openvswitch-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
neutron-openvswitch-agent-init-modules.sh: |
{{ tuple "bin/_neutron-openvswitch-agent-init-modules.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+{{- if .Values.conf.netoffload.enabled }}
neutron-openvswitch-agent-init-netoffload.sh: |
{{ tuple "bin/_neutron-openvswitch-agent-init-netoffload.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+{{- end }}
neutron-openvswitch-agent-readiness.sh: |
{{ tuple "bin/_neutron-openvswitch-agent-readiness.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
neutron-openvswitch-agent-liveness.sh: |
diff --git a/charts/neutron/templates/configmap-etc.yaml b/charts/neutron/templates/configmap-etc.yaml
index ffc535b..c49b7ff 100644
--- a/charts/neutron/templates/configmap-etc.yaml
+++ b/charts/neutron/templates/configmap-etc.yaml
@@ -310,7 +310,9 @@
neutron_sudoers: {{ $envAll.Values.conf.neutron_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
auto_bridge_add: {{ toJson $envAll.Values.conf.auto_bridge_add | b64enc }}
+{{- if .Values.conf.netoffload.enabled }}
netoffload: {{ toJson $envAll.Values.conf.netoffload | b64enc }}
+{{- end }}
dpdk.conf: {{ toJson $envAll.Values.conf.ovs_dpdk | b64enc }}
update_dpdk_bond_config: {{ $envAll.Values.conf.ovs_dpdk.update_dpdk_bond_config | toString | b64enc }}
{{- if ( has "ovn" .Values.network.backend ) }}
diff --git a/charts/neutron/templates/daemonset-ovs-agent.yaml b/charts/neutron/templates/daemonset-ovs-agent.yaml
index 3b4f1e8..82bbd36 100644
--- a/charts/neutron/templates/daemonset-ovs-agent.yaml
+++ b/charts/neutron/templates/daemonset-ovs-agent.yaml
@@ -93,6 +93,7 @@
- name: pci-devices
mountPath: /sys/bus/pci/devices
{{- end }}
+{{- if .Values.conf.netoffload.enabled }}
- name: netoffload
{{ tuple $envAll "netoffload" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ dict "envAll" $envAll "application" "neutron_ovs_agent" "container" "netoffload" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
@@ -111,6 +112,7 @@
readOnly: true
- name: run
mountPath: /run
+{{- end }}
- name: neutron-ovs-agent-init
{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
diff --git a/charts/neutron/values.yaml b/charts/neutron/values.yaml
index 9966a6f..83968e7 100644
--- a/charts/neutron/values.yaml
+++ b/charts/neutron/values.yaml
@@ -1984,6 +1984,7 @@
# Network off-loading configuration
netoffload:
+ enabled: false
asap2:
# - dev: enp97s0f0
# vfs: 16