github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-20 17:10:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #553 from venuiyer/vi-multus

Browse Source 
Allow the default-route to be empty
This commit is contained in:
Doug Smith
2020-12-10 09:45:53 -05:00
committed by GitHub
parent 476c738c13 292d9a9af3
commit 24386abae3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
multus/multus.go
View File

@@ -617,7 +617,11 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) (c
logging.Debugf("Marked interface %v for gateway deletion", ifName) logging.Debugf("Marked interface %v for gateway deletion", ifName)
} else { } else {
// Otherwise, determine if this interface now gets our default route. // Otherwise, determine if this interface now gets our default route.
if delegate.GatewayRequest != nil { // According to
// https://docs.google.com/document/d/1Ny03h6IDVy_e_vmElOqR7UdTPAG_RNydhVE1Kx54kFQ (4.1.2.1.9)
// the list can be empty; if it is, we'll assume the CNI's config for the default gateway holds,
// else we'll update the defaultgateway to the one specified.
if delegate.GatewayRequest != nil && delegate.GatewayRequest[0] != nil {
deletegateway = true deletegateway = true
adddefaultgateway = true adddefaultgateway = true
logging.Debugf("Detected gateway override on interface %v to %v", ifName, delegate.GatewayRequest) logging.Debugf("Detected gateway override on interface %v to %v", ifName, delegate.GatewayRequest)