Skip to content
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.

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

spidermultusconfig: add missing filed for generateCoordinatorCNIConf #3283

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions pkg/multuscniconfig/multusconfig_informer.go
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,15 @@ func generateCoordinatorCNIConf(coordinatorSpec *spiderpoolv2beta1.CoordinatorSp
if coordinatorSpec.DetectGateway != nil {
coordinatorNetConf.DetectGateway = coordinatorSpec.DetectGateway
}
if coordinatorSpec.TunePodRoutes != nil {
coordinatorNetConf.TunePodRoutes = coordinatorSpec.TunePodRoutes
}
if len(coordinatorSpec.HijackCIDR) > 0 {
coordinatorNetConf.HijackCIDR = coordinatorSpec.HijackCIDR
}
if coordinatorSpec.TxQueueLen != nil {
coordinatorNetConf.TxQueueLen = coordinatorSpec.TxQueueLen
}
}

return coordinatorNetConf
Expand Down
2 changes: 2 additions & 0 deletions pkg/multuscniconfig/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ type IfacerNetConf struct {
}

type CoordinatorConfig struct {
TxQueueLen *int `json:"txQueueLen,omitempty"`
IPConflict *bool `json:"detectIPConflict,omitempty"`
DetectGateway *bool `json:"detectGateway,omitempty"`
TunePodRoutes *bool `json:"tunePodRoutes,omitempty"`
MacPrefix string `json:"podMACPrefix,omitempty"`
Mode coordinatorcmd.Mode `json:"mode,omitempty"`
Type string `json:"type"`
Expand Down
Loading