Bump neutron to 0.3.15
This sync asap2 patch to community work
diff --git a/charts/designate/requirements.lock b/charts/designate/requirements.lock
index 3e39f9d..a7c862e 100644
--- a/charts/designate/requirements.lock
+++ b/charts/designate/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-06-15T05:06:33.81687004Z"
+generated: "2023-07-17T05:36:12.20885614Z"
diff --git a/charts/magnum/requirements.lock b/charts/magnum/requirements.lock
index 54efd89..da42f9e 100644
--- a/charts/magnum/requirements.lock
+++ b/charts/magnum/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-06-15T05:06:39.971311252Z"
+generated: "2023-07-17T05:36:12.96108207Z"
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
diff --git a/charts/openvswitch/charts/helm-toolkit/requirements.lock b/charts/openvswitch/charts/helm-toolkit/requirements.lock
index aa38470..bd84c17 100644
--- a/charts/openvswitch/charts/helm-toolkit/requirements.lock
+++ b/charts/openvswitch/charts/helm-toolkit/requirements.lock
@@ -1,3 +1,3 @@
dependencies: []
digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
-generated: "2023-07-08T20:42:05.746624501Z"
+generated: "2023-07-13T00:20:40.989069689Z"
diff --git a/charts/openvswitch/requirements.lock b/charts/openvswitch/requirements.lock
index 4816c65..76b11f3 100644
--- a/charts/openvswitch/requirements.lock
+++ b/charts/openvswitch/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../helm-toolkit
version: 0.2.53
digest: sha256:ffe3f3b02607e6a035f38f83855988fd8d5c388dbd0bd46e75c22b493a50ede9
-generated: "2023-07-08T20:42:12.557808714Z"
+generated: "2023-07-13T00:20:58.830479346Z"
diff --git a/charts/senlin/requirements.lock b/charts/senlin/requirements.lock
index ab96af3..cb79d6a 100644
--- a/charts/senlin/requirements.lock
+++ b/charts/senlin/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-06-15T05:06:37.587407475Z"
+generated: "2023-07-17T05:36:18.511910911Z"
diff --git a/charts/tempest/requirements.lock b/charts/tempest/requirements.lock
index 61e60da..936cabf 100644
--- a/charts/tempest/requirements.lock
+++ b/charts/tempest/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-06-15T05:06:42.232741529Z"
+generated: "2023-07-17T05:36:19.662975956Z"
diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index 970c0b9..ecc08e0 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -132,7 +132,7 @@
curl -sL https://github.com/rancher/local-path-provisioner/archive/refs/tags/v${LOCAL_PATH_PROVISIONER_VERSION}.tar.gz \
| tar -xz -C ${ATMOSPHERE}/charts --strip-components=3 local-path-provisioner-${LOCAL_PATH_PROVISIONER_VERSION}/deploy/chart/
-NEUTRON_VERSION=0.3.13
+NEUTRON_VERSION=0.3.15
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/neutron-${NEUTRON_VERSION}.tgz \
| tar -xz -C ${ATMOSPHERE}/charts
curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~883168/revisions/11/patch?download' \
@@ -141,12 +141,6 @@
| filterdiff -p2 -x 'Chart.yaml' \
| filterdiff -p1 -i 'neutron/*' \
| patch -p2 -d ${ATMOSPHERE}/charts/neutron
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~887354/revisions/2/patch?download' \
- | base64 --decode \
- | filterdiff -p1 -x 'releasenotes/*' \
- | filterdiff -p2 -x 'Chart.yaml' \
- | filterdiff -p1 -i 'neutron/*' \
- | patch -p2 -d ${ATMOSPHERE}/charts/neutron
NOVA_VERISON=0.3.10
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/nova-${NOVA_VERISON}.tgz \
diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index a4cd93f..47aff4d 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -62,6 +62,8 @@
tunnel_id_ranges: 1:1000
ml2_type_vlan:
network_vlan_ranges: external:1:4094
+ netoffload:
+ enabled: true
manifests:
ingress_server: false
service_ingress_server: false