feat: support vxlan tunnel

kubeovn · Apr 29, 2021 · 0489a72 · 0489a72
1 parent 801a04e
commit 0489a72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -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:

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -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:

diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
@@ -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