Skip to content

fix: Add 169.254.1.1 GW for Windows CNI Overlay Mode #1587

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
merged 1 commit into from
Sep 13, 2022
Merged

fix: Add 169.254.1.1 GW for Windows CNI Overlay Mode #1587

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
13 changes: 9 additions & 4 deletions cni/network/invoker_cns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import (
)

var (
errEmptyCNIArgs = errors.New("empty CNI cmd args not allowed")
errInvalidArgs = errors.New("invalid arg(s)")
errEmptyCNIArgs = errors.New("empty CNI cmd args not allowed")
errInvalidArgs = errors.New("invalid arg(s)")
overlayGatewayIP = "169.254.1.1"
)

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

ncgw := net.ParseIP(info.ncGatewayIPAddress)
if ncgw == nil && invoker.ipamMode != util.V4Overlay {
return IPAMAddResult{}, errors.Wrap(errInvalidArgs, "%w: Gateway address "+info.ncGatewayIPAddress+" from response is invalid")
if ncgw == nil {
if invoker.ipamMode != util.V4Overlay {
return IPAMAddResult{}, errors.Wrap(errInvalidArgs, "%w: Gateway address "+info.ncGatewayIPAddress+" from response is invalid")
}

ncgw = net.ParseIP(overlayGatewayIP)
}

// set result ipconfigArgument from CNS Response Body
Expand Down