Rename MinInterval to MinEventSyncInterval

Co-authored-by: Raffaele Di Fazio <raffo@github.com>
kubernetes-sigs · Mar 24, 2021 · 43f9f56 · 43f9f56
1 parent 72b4b4f
commit 43f9f56
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -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.
@@ -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 {

diff --git a/controller/controller_test.go b/controller/controller_test.go
@@ -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()
 

diff --git a/main.go b/main.go
@@ -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 {

diff --git a/pkg/apis/externaldns/types.go b/pkg/apis/externaldns/types.go
@@ -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
@@ -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,
@@ -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)

diff --git a/pkg/apis/externaldns/types_test.go b/pkg/apis/externaldns/types_test.go
@@ -90,7 +90,7 @@ var (
 		TXTPrefix:                   "",
 		TXTCacheInterval:            0,
 		Interval:                    time.Minute,
-		MinInterval:                 5 * time.Second,
+		MinEventSyncInterval:        5 * time.Second,
 		Once:                        false,
 		DryRun:                      false,
 		UpdateEvents:                false,
@@ -176,7 +176,7 @@ var (
 		TXTPrefix:                   "associated-txt-record",
 		TXTCacheInterval:            12 * time.Hour,
 		Interval:                    10 * time.Minute,
-		MinInterval:                 50 * time.Second,
+		MinEventSyncInterval:        50 * time.Second,
 		Once:                        true,
 		DryRun:                      true,
 		UpdateEvents:                true,
@@ -289,7 +289,7 @@ func TestParseFlags(t *testing.T) {
 				"--txt-prefix=associated-txt-record",
 				"--txt-cache-interval=12h",
 				"--interval=10m",
-				"--min-interval=50s",
+				"--min-event-sync-interval=50s",
 				"--once",
 				"--dry-run",
 				"--events",
@@ -381,7 +381,7 @@ func TestParseFlags(t *testing.T) {
 				"EXTERNAL_DNS_TXT_PREFIX":                      "associated-txt-record",
 				"EXTERNAL_DNS_TXT_CACHE_INTERVAL":              "12h",
 				"EXTERNAL_DNS_INTERVAL":                        "10m",
-				"EXTERNAL_DNS_MIN_INTERVAL":                    "50s",
+				"EXTERNAL_DNS_MIN_EVENT_SYNC_INTERVAL":         "50s",
 				"EXTERNAL_DNS_ONCE":                            "1",
 				"EXTERNAL_DNS_DRY_RUN":                         "1",
 				"EXTERNAL_DNS_EVENTS":                          "1",