Skip to content

Commit

Permalink
Rename MinInterval to MinEventSyncInterval
Browse files Browse the repository at this point in the history
Co-authored-by: Raffaele Di Fazio <raffo@github.com>
  • Loading branch information
tjamet and Raffo committed Mar 24, 2021
1 parent 72b4b4f commit d0ccc9b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ type Controller struct {
nextRunAtMux sync.Mutex
// DNS record types that will be considered for management
ManagedRecordTypes []string
// MinInterval is used as window for batching events
MinInterval time.Duration
// MinEventSyncInterval is used as window for batching events
MinEventSyncInterval time.Duration
}

// RunOnce runs a single iteration of a reconciliation loop.
Expand Down Expand Up @@ -171,7 +171,7 @@ func (c *Controller) RunOnce(ctx context.Context) error {
func (c *Controller) ScheduleRunOnce(now time.Time) {
c.nextRunAtMux.Lock()
defer c.nextRunAtMux.Unlock()
c.nextRunAt = now.Add(c.MinInterval)
c.nextRunAt = now.Add(c.MinEventSyncInterval)
}

func (c *Controller) ShouldRunOnce(now time.Time) bool {
Expand Down
2 changes: 1 addition & 1 deletion controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func TestRunOnce(t *testing.T) {
}

func TestShouldRunOnce(t *testing.T) {
ctrl := &Controller{Interval: 10 * time.Minute, MinInterval: 5 * time.Second}
ctrl := &Controller{Interval: 10 * time.Minute, MinEventSyncInterval: 5 * time.Second}

now := time.Now()

Expand Down
14 changes: 7 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,13 @@ func main() {
}

ctrl := controller.Controller{
Source: endpointsSource,
Registry: r,
Policy: policy,
Interval: cfg.Interval,
DomainFilter: domainFilter,
ManagedRecordTypes: cfg.ManagedDNSRecordTypes,
MinInterval: cfg.MinInterval,
Source: endpointsSource,
Registry: r,
Policy: policy,
Interval: cfg.Interval,
DomainFilter: domainFilter,
ManagedRecordTypes: cfg.ManagedDNSRecordTypes,
MinEventSyncInterval: cfg.MinEventSyncInterval,
}

if cfg.Once {
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/externaldns/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type Config struct {
TXTPrefix string
TXTSuffix string
Interval time.Duration
MinInterval time.Duration
MinEventSyncInterval time.Duration
Once bool
DryRun bool
UpdateEvents bool
Expand Down Expand Up @@ -235,7 +235,7 @@ var defaultConfig = &Config{
TXTSuffix: "",
TXTCacheInterval: 0,
TXTWildcardReplacement: "",
MinInterval: 5 * time.Second,
MinEventSyncInterval: 5 * time.Second,
Interval: time.Minute,
Once: false,
DryRun: false,
Expand Down Expand Up @@ -456,7 +456,7 @@ func (cfg *Config) ParseFlags(args []string) error {
// Flags related to the main control loop
app.Flag("txt-cache-interval", "The interval between cache synchronizations in duration format (default: disabled)").Default(defaultConfig.TXTCacheInterval.String()).DurationVar(&cfg.TXTCacheInterval)
app.Flag("interval", "The interval between two consecutive synchronizations in duration format (default: 1m)").Default(defaultConfig.Interval.String()).DurationVar(&cfg.Interval)
app.Flag("min-interval", "The minimum interval between two consecutive synchronizations triggered from kubernetes events in duration format (default: 5s)").Default(defaultConfig.MinInterval.String()).DurationVar(&cfg.MinInterval)
app.Flag("min-event-sync-interval", "The minimum interval between two consecutive synchronizations triggered from kubernetes events in duration format (default: 5s)").Default(defaultConfig.MinEventSyncInterval.String()).DurationVar(&cfg.MinEventSyncInterval)
app.Flag("once", "When enabled, exits the synchronization loop after the first iteration (default: disabled)").BoolVar(&cfg.Once)
app.Flag("dry-run", "When enabled, prints DNS record changes rather than actually performing them (default: disabled)").BoolVar(&cfg.DryRun)
app.Flag("events", "When enabled, in addition to running every interval, the reconciliation loop will get triggered when supported sources change (default: disabled)").BoolVar(&cfg.UpdateEvents)
Expand Down

0 comments on commit d0ccc9b

Please sign in to comment.