Merge pull request #784 from l1b0k/feat/ipam_

add flag to force controlplane run in centralized IPAM
AliyunContainerService · Feb 10, 2025 · 58849ba · 58849ba
2 parents 8cb87e0 + f070e74
commit 58849ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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"`