Merge pull request #500 from JacobTanenbaum/noHostSubnets

Bug 1789881: Start ovn correctly with hybrid networking
openshift · Mar 4, 2020 · 2e892e2 · 2e892e2
2 parents 94229e1 + 77f7e60
commit 2e892e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -362,7 +362,7 @@ spec:
 
           hybrid_overlay_flags=
           if [[ -n "{{.OVNHybridOverlayEnable }}" ]]; then
-            hybrid_overlay_flags="--enable-hybrid-overlay"
+            hybrid_overlay_flags="--enable-hybrid-overlay --no-hostsubnet-nodes=\"kubernetes.io/os=windows\""
             if [[ -n "{{.OVNHybridOverlayNetCIDR}}" ]]; then
               hybrid_overlay_flags="${hybrid_overlay_flags} --hybrid-overlay-cluster-subnets={{.OVNHybridOverlayNetCIDR}}"
             fi