Skip to content

Commit 58849ba

Browse files
authored
Merge pull request #784 from l1b0k/feat/ipam_
add flag to force controlplane run in centralized IPAM
2 parents 8cb87e0 + f070e74 commit 58849ba

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: cmd/terway-controlplane/terway-controlplane.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ func initOpenTelemetry(ctx context.Context, serviceName, serviceVersion string,
364364
}
365365

366366
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 {
368368
return nil
369369
}
370370

Diff for: types/controlplane/config_default.go

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ type Config struct {
7070

7171
BackoffOverride map[string]wait.Backoff `json:"backoffOverride,omitempty"`
7272
IPAMType string `json:"ipamType"`
73+
CentralizedIPAM bool `json:"centralizedIPAM,omitempty"`
7374

7475
RateLimit map[string]int `json:"rateLimit"`
7576

0 commit comments

Comments
 (0)