Skip to content

Commit feabc22

Browse files
jaer-tsunJaeryn
andauthored
fix: Add 169.254.1.1 GW for Windows CNI Overlay Mode (#1587)
Use 169.254.1.1 gw for cni in overlay mode Co-authored-by: Jaeryn <[email protected]>
1 parent a9a0a5f commit feabc22

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

cni/network/invoker_cns.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import (
2020
)
2121

2222
var (
23-
errEmptyCNIArgs = errors.New("empty CNI cmd args not allowed")
24-
errInvalidArgs = errors.New("invalid arg(s)")
23+
errEmptyCNIArgs = errors.New("empty CNI cmd args not allowed")
24+
errInvalidArgs = errors.New("invalid arg(s)")
25+
overlayGatewayIP = "169.254.1.1"
2526
)
2627

2728
type CNSIPAMInvoker struct {
@@ -99,8 +100,12 @@ func (invoker *CNSIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, erro
99100
log.Printf("[cni-invoker-cns] Received info %+v for pod %v", info, podInfo)
100101

101102
ncgw := net.ParseIP(info.ncGatewayIPAddress)
102-
if ncgw == nil && invoker.ipamMode != util.V4Overlay {
103-
return IPAMAddResult{}, errors.Wrap(errInvalidArgs, "%w: Gateway address "+info.ncGatewayIPAddress+" from response is invalid")
103+
if ncgw == nil {
104+
if invoker.ipamMode != util.V4Overlay {
105+
return IPAMAddResult{}, errors.Wrap(errInvalidArgs, "%w: Gateway address "+info.ncGatewayIPAddress+" from response is invalid")
106+
}
107+
108+
ncgw = net.ParseIP(overlayGatewayIP)
104109
}
105110

106111
// set result ipconfigArgument from CNS Response Body

0 commit comments

Comments
 (0)