Skip to content

[release-4.13] OCPBUGS-14880: Remove config flag externalGatewayInterface from ovn.yaml #1922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 3, 2023
Merged

[release-4.13] OCPBUGS-14880: Remove config flag externalGatewayInterface from ovn.yaml #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions docs/network/default_cni_plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ The following configs are supported in ovn-kubernetes config file:
|:--------------------------------|:--------|:-------|:-------|:----------------------------------------------------------------------------|:------|
|ovsInit.disableOVSInit |N |bool |false |Skip configuring OVS bridge "br-ex" in microshift-ovs-init.service |true |
|ovsInit.gatewayInterface |N |string |"" |Interface to be added in OVS gateway bridge "br-ex" |eth0 |
|ovsInit.externalGatewayInterface |N |string |"" |Interface to be added in external OVS gateway bridge "br-ex1" |eth1 |
|mtu |N |int |*auto* |MTU value to be used for the Pods, must be less than or equal to the MTU of default route interface|1500|

> When `disableOVSInit` is true, OVS bridge "br-ex" needs to be configured manually. This OVS bridge is required by ovn-kubernetes CNI. See section [OVS bridge](#ovs-bridge) for guidance on configuring the OVS gateway bridge manually.
Expand All @@ -80,7 +79,6 @@ Below is an example of `ovn.yaml`:
ovsInit:
disableOVSInit: true
gatewayInterface: eth0
externalGatewayInterface: eth1
mtu: 1500
```
**NOTE:* The change of `mtu` configuration in `ovn.yaml` requires node reboot to take effect. <br>
Expand Down Expand Up @@ -147,12 +145,6 @@ microshift-ovs-init.service is able to use user specified host interface for clu
This is done by specifying the `gatewayInterface` in the CNI config file `/etc/microshift/ovn.yaml`.
The specified interface will be added in OVS bridge `br-ex` which acts as gateway bridge for ovn-kubernetes CNI network.

### Second gateway interface

microshift-ovs-init.service is able to setup one additional host interface for cluster ingress/egress traffic.
This is done by specifying the `externalGatewayInterface` in the CNI config file `/etc/microshift/ovn.yaml`.
The external gateway interface will be added in a second OVS bridge `br-ex1`. Cluster pod traffic destinated to additional host subnet will be routed through `br-ex1`.

### Blocking external access to NodePort service on specific host interfaces

ovn-kubernetes doesn't restrict the host interfaces where NodePort service can be accessed from outside MicroShift node. The following `nft` instructions block NodePort service on a specific host interface. <br>
Expand Down
2 changes: 0 additions & 2 deletions docs/network/host_networking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ The following physical network interfaces are created or modified by ovn-kuberne
|name |type |description |comment |
|:------------------|:-----------------|:----------------------|:---------------------------------------------------------------------------------------------------|
|br-ex |OVS bridge |gateway bridge |created by microshift-ovs-init.service or manually |
|br-ex1 |OVS bridge |external gateway bridge|created by microshift-ovs-init.service when externalGatewayInterface is configured |
|br-int |OVS bridge |integration bridge |created by ovnkube-master container |
|patch-br-ex |OVS patch port | |created by ovnkube-master container, connect br-ex to br-int |
|patch-br-int |OVS patch port | |created by ovnkube-master container, connect br-int to br-ex |
Expand All @@ -52,7 +51,6 @@ The following physical network interfaces are created or modified by ovn-kuberne
|7ea12e348b34f1e |veth |pod veth interface |created and plugged to br-int by ovnkube-master container, the other end connects to pod namespace |

- `7ea12e348b34f1e` is one end of veth pair that connects pod to br-int, it is named after the first 15 bits of pod sandbox ID. The other end of veth pair is in pod network namespace (named `eth0` inside pod). There could be as many veth pairs as the number of pods. <br>
- `br-ex1` is created by `microshift-ovs.init.service` when `externalGatewayInterface` is configured in `/etc/microshift/ovn.yaml`. `externalGatewayInterface` is added into `br-ex1` as its uplink port whose IP is also moved to `br-ex1`. Cluster egress traffic destinated to `externalGatewayInterface` subnet will be routed through `br-ex1`. <br>

A snapshot of OVS interfaces from running MicroShift cluster:

Expand Down
3 changes: 0 additions & 3 deletions packaging/microshift/ovn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ovsInit:
# Interface to be added in OVS gateway bridge "br-ex"
#gatewayInterface: ""

# Interface to be added in external OVS gateway bridge "br-ex1"
#externalGatewayInterface: ""

# MTU value to be used for the Pods, must be less than or equal to the MTU of
# default route interface.
#mtu: 1500
14 changes: 0 additions & 14 deletions pkg/config/ovn/ovn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
const (
ovnConfigFileName = "ovn.yaml"
OVNGatewayInterface = "br-ex"
OVNExternalGatewayInterface = "br-ex1"
defaultMTU = 1500
OVNKubernetesV4MasqueradeIP = "169.254.169.2"
OVNKubernetesV6MasqueradeIP = "fd69::2"
Expand All @@ -34,8 +33,6 @@ type OVSInitConfig struct {
DisableOVSInit bool `json:"disableOVSInit,omitempty"`
// Uplink interface for OVS bridge "br-ex"
GatewayInterface string `json:"gatewayInterface,omitempty"`
// Uplink interface for OVS bridge "br-ex1"
ExternalGatewayInterface string `json:"externalGatewayInterface,omitempty"`
}

func (o *OVNKubernetesConfig) Validate() error {
Expand Down Expand Up @@ -66,17 +63,6 @@ func (o *OVNKubernetesConfig) validateConfig() error {
return fmt.Errorf("gateway interface %s not found", o.OVSInit.GatewayInterface)
}
}
if o.OVSInit.ExternalGatewayInterface != "" {
_, err := net.InterfaceByName(o.OVSInit.ExternalGatewayInterface)
if err != nil {
return fmt.Errorf("external gateway interface %s not found", o.OVSInit.ExternalGatewayInterface)
}
_, err = net.InterfaceByName(OVNExternalGatewayInterface)
if err != nil {
return fmt.Errorf("external gateway interface %s is configured, but external gateway bridge %s not found",
o.OVSInit.ExternalGatewayInterface, OVNExternalGatewayInterface)
}
}

// validate MTU conf
iface, err := net.InterfaceByName(OVNGatewayInterface)
Expand Down