From 1f54cef71ceb02c274bbd7b322e7340733f62663 Mon Sep 17 00:00:00 2001 From: William Turner Date: Mon, 31 Oct 2022 16:16:45 -0400 Subject: [PATCH] Add variable to set direct routing on flannel VXLAN (#9438) --- inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml | 1 + roles/network_plugin/flannel/defaults/main.yml | 1 + roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml index a42c5b3be..1a38ba71f 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml @@ -16,3 +16,4 @@ # flannel_backend_type: "vxlan" # flannel_vxlan_vni: 1 # flannel_vxlan_port: 8472 +# flannel_vxlan_direct_routing: false diff --git a/roles/network_plugin/flannel/defaults/main.yml b/roles/network_plugin/flannel/defaults/main.yml index b07513517..cd1dcf16d 100644 --- a/roles/network_plugin/flannel/defaults/main.yml +++ b/roles/network_plugin/flannel/defaults/main.yml @@ -19,6 +19,7 @@ flannel_backend_type: "vxlan" flannel_vxlan_vni: 1 flannel_vxlan_port: 8472 +flannel_vxlan_direct_routing: false # Limits for apps flannel_memory_limit: 500M diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 index 59cecb257..fb6f5bf88 100644 --- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 +++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 @@ -34,7 +34,8 @@ data: "Backend": { "Type": "{{ flannel_backend_type }}"{% if flannel_backend_type == "vxlan" %}, "VNI": {{ flannel_vxlan_vni }}, - "Port": {{ flannel_vxlan_port }} + "Port": {{ flannel_vxlan_port }}, + "DirectRouting": {{ flannel_vxlan_direct_routing | to_json }} {% endif %} } }