Skip to content

Commit d2a643e

Browse files
committed
Add support for OVN-Kubernetes no-overlay mode configuration
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
1 parent 3b760a1 commit d2a643e

8 files changed

+3744
-6
lines changed

bindata/network/ovn-kubernetes/managed/004-config.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ data:
1313
routable-mtu="{{.RoutableMTU}}"
1414
{{- end }}
1515
cluster-subnets="{{.OVN_cidr}}"
16+
{{- if .DefaultNetworkTransport }}
17+
transport="{{.DefaultNetworkTransport}}"
18+
{{- end }}
1619
encap-port="{{.GenevePort}}"
1720
enable-lflow-cache=true
1821
lflow-cache-limit-kb=1048576
@@ -52,6 +55,26 @@ data:
5255
[gateway]
5356
mode={{.OVN_GATEWAY_MODE}}
5457
nodeport=true
58+
{{- if .NoOverlayEnabled }}
59+
60+
[no-overlay]
61+
{{- if .NoOverlayOutboundSNAT }}
62+
outbound-snat={{.NoOverlayOutboundSNAT}}
63+
{{- end }}
64+
{{- if .NoOverlayRouting }}
65+
routing={{.NoOverlayRouting}}
66+
{{- end }}
67+
{{- end }}
68+
{{- if .NoOverlayManagedEnabled }}
69+
70+
[bgp.managed]
71+
{{- if .NoOverlayManagedASNumber }}
72+
as-number={{.NoOverlayManagedASNumber}}
73+
{{- end }}
74+
{{- if .NoOverlayManagedTopology }}
75+
topology={{.NoOverlayManagedTopology}}
76+
{{- end }}
77+
{{- end }}
5578
{{- if .OVNHybridOverlayEnable }}
5679

5780
[hybridoverlay]
@@ -95,6 +118,9 @@ data:
95118
routable-mtu="{{.RoutableMTU}}"
96119
{{- end }}
97120
cluster-subnets="{{.OVN_cidr}}"
121+
{{- if .DefaultNetworkTransport }}
122+
transport="{{.DefaultNetworkTransport}}"
123+
{{- end }}
98124
encap-port="{{.GenevePort}}"
99125
enable-lflow-cache=true
100126
lflow-cache-limit-kb=1048576
@@ -140,6 +166,26 @@ data:
140166
[gateway]
141167
mode={{.OVN_GATEWAY_MODE}}
142168
nodeport=true
169+
{{- if .NoOverlayEnabled }}
170+
171+
[no-overlay]
172+
{{- if .NoOverlayOutboundSNAT }}
173+
outbound-snat={{.NoOverlayOutboundSNAT}}
174+
{{- end }}
175+
{{- if .NoOverlayRouting }}
176+
routing={{.NoOverlayRouting}}
177+
{{- end }}
178+
{{- end }}
179+
{{- if .NoOverlayManagedEnabled }}
180+
181+
[bgp.managed]
182+
{{- if .NoOverlayManagedASNumber }}
183+
as-number={{.NoOverlayManagedASNumber}}
184+
{{- end }}
185+
{{- if .NoOverlayManagedTopology }}
186+
topology={{.NoOverlayManagedTopology}}
187+
{{- end }}
188+
{{- end }}
143189

144190

145191
{{- if .OVNHybridOverlayEnable }}

bindata/network/ovn-kubernetes/self-hosted/004-config.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ data:
1313
routable-mtu="{{.RoutableMTU}}"
1414
{{- end }}
1515
cluster-subnets="{{.OVN_cidr}}"
16+
{{- if .DefaultNetworkTransport }}
17+
transport="{{.DefaultNetworkTransport}}"
18+
{{- end }}
1619
encap-port="{{.GenevePort}}"
1720
enable-lflow-cache=true
1821
lflow-cache-limit-kb=1048576
@@ -62,6 +65,26 @@ data:
6265
[gateway]
6366
mode={{.OVN_GATEWAY_MODE}}
6467
nodeport=true
68+
{{- if .NoOverlayEnabled }}
69+
70+
[no-overlay]
71+
{{- if .NoOverlayOutboundSNAT }}
72+
outbound-snat={{.NoOverlayOutboundSNAT}}
73+
{{- end }}
74+
{{- if .NoOverlayRouting }}
75+
routing={{.NoOverlayRouting}}
76+
{{- end }}
77+
{{- end }}
78+
{{- if .NoOverlayManagedEnabled }}
79+
80+
[bgp.managed]
81+
{{- if .NoOverlayManagedASNumber }}
82+
as-number={{.NoOverlayManagedASNumber}}
83+
{{- end }}
84+
{{- if .NoOverlayManagedTopology }}
85+
topology={{.NoOverlayManagedTopology}}
86+
{{- end }}
87+
{{- end }}
6588

6689
[logging]
6790
libovsdblogfile=/var/log/ovnkube/libovsdb.log

0 commit comments

Comments
 (0)