remove unused config

Signed-off-by: Zhang Kang <kang.zhang@intel.com>
koordinator-sh · Mar 28, 2024 · 82f324e · 82f324e
1 parent 0193a90
commit 82f324e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/pkg/koordlet/runtimehooks/config.go b/pkg/koordlet/runtimehooks/config.go
@@ -134,6 +134,7 @@ func NewDefaultConfig() *Config {
 		RuntimeHooksNRIReconnectInitInterval: 10 * time.Second,
 		RuntimeHooksNRIReconnectMaxInterval:  5 * time.Minute,
 		RuntimeHooksNRIReconnectLimit:        100,
+		RuntimeHooksNRIReconnectMul:          2,
 		RuntimeHooksNRISocketPath:            "nri/nri.sock",
 		RuntimeHookReconcileInterval:         10 * time.Second,
 	}

diff --git a/pkg/koordlet/runtimehooks/config_test.go b/pkg/koordlet/runtimehooks/config_test.go
@@ -28,17 +28,20 @@ import (
 
 func Test_NewDefaultConfig(t *testing.T) {
 	expectConfig := &Config{
-		RuntimeHooksNetwork:              "unix",
-		RuntimeHooksAddr:                 "/host-var-run-koordlet/koordlet.sock",
-		RuntimeHooksFailurePolicy:        "Ignore",
-		RuntimeHooksPluginFailurePolicy:  "Ignore",
-		RuntimeHookConfigFilePath:        system.Conf.RuntimeHooksConfigDir,
-		RuntimeHookHostEndpoint:          "/var/run/koordlet/koordlet.sock",
-		RuntimeHookDisableStages:         []string{},
-		RuntimeHooksNRI:                  true,
-		RuntimeHooksNRIReconnectInterval: 10 * time.Second,
-		RuntimeHooksNRISocketPath:        "nri/nri.sock",
-		RuntimeHookReconcileInterval:     10 * time.Second,
+		RuntimeHooksNetwork:                  "unix",
+		RuntimeHooksAddr:                     "/host-var-run-koordlet/koordlet.sock",
+		RuntimeHooksFailurePolicy:            "Ignore",
+		RuntimeHooksPluginFailurePolicy:      "Ignore",
+		RuntimeHookConfigFilePath:            system.Conf.RuntimeHooksConfigDir,
+		RuntimeHookHostEndpoint:              "/var/run/koordlet/koordlet.sock",
+		RuntimeHookDisableStages:             []string{},
+		RuntimeHooksNRI:                      true,
+		RuntimeHooksNRIReconnectInitInterval: 10 * time.Second,
+		RuntimeHooksNRIReconnectMaxInterval:  5 * time.Minute,
+		RuntimeHooksNRIReconnectLimit:        100,
+		RuntimeHooksNRIReconnectMul:          2,
+		RuntimeHooksNRISocketPath:            "nri/nri.sock",
+		RuntimeHookReconcileInterval:         10 * time.Second,
 	}
 	defaultConfig := NewDefaultConfig()
 	assert.Equal(t, expectConfig, defaultConfig)

diff --git a/pkg/koordlet/runtimehooks/nri/server.go b/pkg/koordlet/runtimehooks/nri/server.go
@@ -50,7 +50,6 @@ type Options struct {
 	// todo: add support for disable stages
 	DisableStages      map[string]struct{}
 	Executor           resourceexecutor.ResourceUpdateExecutor
-	ReconnectInterval  time.Duration
 	ReconnectionOption ReconnectionOption
 }
 

diff --git a/pkg/koordlet/runtimehooks/runtimehooks.go b/pkg/koordlet/runtimehooks/runtimehooks.go
@@ -111,7 +111,6 @@ func NewRuntimeHook(si statesinformer.StatesInformer, cfg *Config) (RuntimeHook,
 			PluginFailurePolicy: pluginFailurePolicy,
 			DisableStages:       getDisableStagesMap(cfg.RuntimeHookDisableStages),
 			Executor:            e,
-			ReconnectInterval:   cfg.RuntimeHooksNRIReconnectInitInterval,
 			ReconnectionOption: nri.ReconnectionOption{
 				LimitTimes: cfg.RuntimeHooksNRIReconnectLimit,
 				Backoff:    backOff,