Skip to content

OCPBUGS-58306: Disable network segmentation when multus is disabled #2739

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-58306: Disable network segmentation when multus is disabled #2739

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
2 changes: 2 additions & 0 deletions pkg/network/ovn_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
data.Data["OVN_MULTI_NETWORK_POLICY_ENABLE"] = false
if conf.DisableMultiNetwork != nil && *conf.DisableMultiNetwork {
data.Data["OVN_MULTI_NETWORK_ENABLE"] = false
data.Data["OVN_NETWORK_SEGMENTATION_ENABLE"] = false
klog.Warningf("Forcing OVN_NETWORK_SEGMENTATION_ENABLE=false because DisableMultiNetwork=true in the operator config")
} else if conf.UseMultiNetworkPolicy != nil && *conf.UseMultiNetworkPolicy {
// Multi-network policy support requires multi-network support to be
// enabled
Expand Down
43 changes: 43 additions & 0 deletions pkg/network/ovn_kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,49 @@ logfile-maxage=0`,
controlPlaneReplicaCount: 2,
enabledFeatureGates: []configv1.FeatureGateName{apifeatures.FeatureGateNetworkSegmentation},
},
{
desc: "disable network segmentation when multi-network is disabled",
expected: `
[default]
mtu="1500"
cluster-subnets="10.128.0.0/15/23,10.0.0.0/14/24"
encap-port="8061"
enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"

[kubernetes]
service-cidrs="172.30.0.0/16"
ovn-config-namespace="openshift-ovn-kubernetes"
apiserver="https://testing.test:8443"
host-network-namespace="openshift-host-network"
platform-type="GCP"
healthz-bind-address="0.0.0.0:10256"
dns-service-namespace="openshift-dns"
dns-service-name="dns-default"

[ovnkubernetesfeature]
enable-egress-ip=true
enable-egress-firewall=true
enable-egress-qos=true
enable-egress-service=true
egressip-node-healthcheck-port=9107
enable-multi-external-gateway=true

[gateway]
mode=shared
nodeport=true

[logging]
libovsdblogfile=/var/log/ovnkube/libovsdb.log
logfile-maxsize=100
logfile-maxbackups=5
logfile-maxage=0`,
controlPlaneReplicaCount: 2,
disableMultiNet: true,
enabledFeatureGates: []configv1.FeatureGateName{apifeatures.FeatureGateNetworkSegmentation},
},
{
desc: "enable multi-network policies without multi-network support",
expected: `
Expand Down