diff --git a/bindata/network/ovn-kubernetes/managed/common/004-config.yaml b/bindata/network/ovn-kubernetes/managed/common/004-config.yaml index ae3874fc10..ddb376478b 100644 --- a/bindata/network/ovn-kubernetes/managed/common/004-config.yaml +++ b/bindata/network/ovn-kubernetes/managed/common/004-config.yaml @@ -60,6 +60,14 @@ data: {{- end }} {{- if .OVNHybridOverlayEnable }} + [clustermanager] +{{- if .V4TransitSwitchSubnet }} + v4-transit-switch-subnet="{{.V4TransitSwitchSubnet}}" +{{- end }} +{{- if .V6TransitSwitchSubnet }} + v6-transit-switch-subnet="{{.V6TransitSwitchSubnet}}" +{{- end }} + [hybridoverlay] enabled=true {{- if .OVNHybridOverlayNetCIDR }} @@ -143,6 +151,13 @@ data: v6-masquerade-subnet="{{.V6InternalMasqueradeSubnet}}" {{- end }} + [clustermanager] +{{- if .V4TransitSwitchSubnet }} + v4-transit-switch-subnet="{{.V4TransitSwitchSubnet}}" +{{- end }} +{{- if .V6TransitSwitchSubnet }} + v6-transit-switch-subnet="{{.V6TransitSwitchSubnet}}" +{{- end }} [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log diff --git a/bindata/network/ovn-kubernetes/self-hosted/common/004-config.yaml b/bindata/network/ovn-kubernetes/self-hosted/common/004-config.yaml index 30979504a2..9fc1cbeb30 100644 --- a/bindata/network/ovn-kubernetes/self-hosted/common/004-config.yaml +++ b/bindata/network/ovn-kubernetes/self-hosted/common/004-config.yaml @@ -62,6 +62,14 @@ data: v6-masquerade-subnet="{{.V6InternalMasqueradeSubnet}}" {{- end }} + [clustermanager] +{{- if .V4TransitSwitchSubnet }} + v4-transit-switch-subnet="{{.V4TransitSwitchSubnet}}" +{{- end }} +{{- if .V6TransitSwitchSubnet }} + v6-transit-switch-subnet="{{.V6TransitSwitchSubnet}}" +{{- end }} + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 diff --git a/pkg/network/ovn_kubernetes_test.go b/pkg/network/ovn_kubernetes_test.go index 0e00dd4351..8ceae89bd1 100644 --- a/pkg/network/ovn_kubernetes_test.go +++ b/pkg/network/ovn_kubernetes_test.go @@ -222,6 +222,8 @@ enable-multi-network=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -263,6 +265,8 @@ mode=shared nodeport=true v4-masquerade-subnet="100.98.0.0/16" +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -310,6 +314,8 @@ enable-multi-network=true mode=local nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -365,6 +371,8 @@ enable-multi-network=true mode=local nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -422,6 +430,8 @@ enable-multi-network=true mode=local nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -478,6 +488,8 @@ enable-multi-network=true mode=local nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -534,6 +546,8 @@ enable-multi-network=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -579,6 +593,8 @@ enable-multi-network=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -627,6 +643,8 @@ enable-multi-network=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -667,6 +685,8 @@ egressip-node-healthcheck-port=9107 mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -710,6 +730,8 @@ enable-admin-network-policy=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100 @@ -752,6 +774,8 @@ enable-admin-network-policy=true mode=shared nodeport=true +[clustermanager] + [logging] libovsdblogfile=/var/log/ovnkube/libovsdb.log logfile-maxsize=100