merger param

Signed-off-by: Guijie Wang <[email protected]>
containerd · Aug 7, 2023 · aa4435f · aa4435f
1 parent d3d9eee
commit aa4435f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/pkg/daemon/command/command.go b/pkg/daemon/command/command.go
@@ -35,8 +35,7 @@ type DaemonCommand struct {
 	LogRotationSize  int    `type:"param" name:"log-rotation-size"`
 	Supervisor       string `type:"param" name:"supervisor"`
 	LogFile          string `type:"param" name:"log-file"`
-	CredentialSource string `type:"param" name:"credential-source"`
-	SystemSock       string `type:"param" name:"systemsock"`
+	BackendSource    string `type:"param" name:"backend-source"`
 }
 
 // Build exec style command line
@@ -185,14 +184,8 @@ func WithUpgrade() Opt {
 	}
 }
 
-func WithCredentialSource(source string) Opt {
+func WithBackendSource(source string) Opt {
 	return func(cmd *DaemonCommand) {
-		cmd.CredentialSource = source
-	}
-}
-
-func WithSystemSock(sock string) Opt {
-	return func(cmd *DaemonCommand) {
-		cmd.SystemSock = sock
+		cmd.BackendSource = source
 	}
 }
diff --git a/pkg/manager/daemon_adaptor.go b/pkg/manager/daemon_adaptor.go
@@ -156,8 +156,7 @@ func (m *Manager) BuildDaemonCommand(d *daemon.Daemon, bin string, upgrade bool)
 			if config.IsCredentialSourceEnabled() {
 				configApiPath := fmt.Sprintf(endpointGetBackendConfig, d.States.ID)
 				cmdOpts = append(cmdOpts,
-					command.WithCredentialSource(configApiPath),
-					command.WithSystemSock(config.SystemControllerAddress()),
+					command.WithBackendSource(config.SystemControllerAddress() + configApiPath),
 				)
 			}
 		default: