Merge pull request #784 from l1b0k/feat/ipam_

BSWANG · web-flow · commit 58849bac5756 · 2025-02-10T16:35:28.000+08:00
add flag to force controlplane run in centralized IPAM
diff --git a/cmd/terway-controlplane/terway-controlplane.go b/cmd/terway-controlplane/terway-controlplane.go
@@ -364,7 +364,7 @@ func initOpenTelemetry(ctx context.Context, serviceName, serviceVersion string,
 }
 
 func detectMultiIP(ctx context.Context, directClient client.Client, cfg *controlplane.Config) error {
-	if !lo.Contains(cfg.Controllers, multiipnode.ControllerName) {
+	if !lo.Contains(cfg.Controllers, multiipnode.ControllerName) || cfg.CentralizedIPAM {
 		return nil
 	}
 
diff --git a/types/controlplane/config_default.go b/types/controlplane/config_default.go
@@ -70,6 +70,7 @@ type Config struct {
 
 	BackoffOverride map[string]wait.Backoff `json:"backoffOverride,omitempty"`
 	IPAMType        string                  `json:"ipamType"`
+	CentralizedIPAM bool                    `json:"centralizedIPAM,omitempty"`
 
 	RateLimit map[string]int `json:"rateLimit"`
 

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ func initOpenTelemetry(ctx context.Context, serviceName, serviceVersion string,`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`func detectMultiIP(ctx context.Context, directClient client.Client, cfg *controlplane.Config) error {`
`367`		`- if !lo.Contains(cfg.Controllers, multiipnode.ControllerName) {`
	`367`	`+ if !lo.Contains(cfg.Controllers, multiipnode.ControllerName) \|\| cfg.CentralizedIPAM {`
`368`	`368`	`return nil`
`369`	`369`	`}`
`370`	`370`