Commit 0489a72a authored by Mengxin Liu's avatar Mengxin Liu Committed by oilbeater
Browse files

feat: support vxlan tunnel

parent 801a04e4
Showing with 8 additions and 2 deletions
+8 -2
......@@ -31,6 +31,7 @@ fi
EXCLUDE_IPS="" # EXCLUDE_IPS for default subnet
LABEL="node-role.kubernetes.io/master" # The node label to deploy OVN DB
NETWORK_TYPE="geneve" # geneve or vlan
TUNNEL_TYPE="geneve" # geneve or vxlan
# VLAN Config only take effect when NETWORK_TYPE is vlan
PROVIDER_NAME="provider"
......@@ -1481,6 +1482,8 @@ spec:
fieldPath: status.podIP
- name: HW_OFFLOAD
value: "$HW_OFFLOAD"
- name: TUNNEL_TYPE
value: "$TUNNEL_TYPE"
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
......
......@@ -40,6 +40,7 @@ fi
EXCLUDE_IPS="" # EXCLUDE_IPS for default subnet
LABEL="node-role.kubernetes.io/master" # The node label to deploy OVN DB
NETWORK_TYPE="geneve" # geneve or vlan
TUNNEL_TYPE="geneve" # geneve or vxlan
# VLAN Config only take effect when NETWORK_TYPE is vlan
PROVIDER_NAME="provider"
......@@ -1520,6 +1521,8 @@ spec:
fieldPath: status.podIP
- name: HW_OFFLOAD
value: "$HW_OFFLOAD"
- name: TUNNEL_TYPE
value: "$TUNNEL_TYPE"
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
......
......@@ -4,7 +4,7 @@ set -euo pipefail
HW_OFFLOAD=${HW_OFFLOAD:-false}
ENABLE_SSL=${ENABLE_SSL:-false}
OVN_DB_IPS=${OVN_DB_IPS:-}
TUNNEL_TYPE=${TUNNEL_TYPE:-geneve}
# Check required kernel module
modinfo openvswitch
......@@ -96,7 +96,7 @@ function gen_conn_str {
ovs-vsctl set open . external-ids:ovn-remote="$(gen_conn_str 6642)"
ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
ovs-vsctl set open . external-ids:ovn-encap-type=geneve
ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
ovs-vsctl set open . external-ids:hostname="${KUBE_NODE_NAME}"
# Start ovn-controller
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment