Merge pull request #828 from s1061123/dev/chroot

Add chroot option in multus-daemon
This commit is contained in:
Doug Smith
2022-04-13 15:38:56 -04:00
committed by GitHub
13 changed files with 269 additions and 54 deletions

View File

@@ -49,7 +49,7 @@ const (
defaultMultusMasterCNIFile = ""
defaultMultusNamespaceIsolation = false
defaultMultusReadinessIndicatorFile = ""
defaultMultusRunDir = "/host/var/run/multus-cni/"
defaultMultusRunDir = "/host/run/multus-cni/"
)
const (
@@ -228,7 +228,7 @@ func startMultusDaemon(configFilePath string) error {
return fmt.Errorf("failed to prepare the cni-socket for communicating with the shim: %w", err)
}
server, err := srv.NewCNIServer(daemonConfig.MultusSocketDir, config)
server, err := srv.NewCNIServer(daemonConfig, config)
if err != nil {
return fmt.Errorf("failed to create the server: %v", err)
}