github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2026-01-05 15:34:24 +00:00
Code Issues Projects Releases Wiki Activity

docs, thick plugin: align docs with new configuration reference (#1055)

Browse Source 
* config, daemon: shim socket path is not needed

The shim socket dir attribute is only required for the shim (cni
configuration). Thus, it can be removed from the daemon configuration.

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>

* config, daemon: rename socket dir attribute

Now the socketDir parameter no longer stutters.

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>

* docs, thick plugin: align docs with new configuration reference

PR #1053 - [0] - changed the thick plugin configuration to happen
exclusively via the user provided config map. This PR aligns the multus
documentation with the existing code.

[0] - https://github.com/k8snetworkplumbingwg/multus-cni/pull/1053

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>

---------

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
This commit is contained in:
Miguel Duarte Barroso
2023-04-06 17:11:17 +02:00
committed by GitHub
parent 21f84c0162
commit 7ced7dd10c
9 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/multus-daemon/main.go
View File

@@ -133,7 +133,7 @@ func main() {
configurationOptions = append(
configurationOptions,
config.WithCniConfigDir(multusConf.CniConfigDir),
config.WithSocketDir(daemonConf.DaemonSocketDir))
config.WithSocketDir(daemonConf.SocketDir))
var logOptionFuncs []config.LogOptionFunc
if multusConf.LogMaxAge != defaultMultusLogMaxAge {
@@ -226,7 +226,7 @@ func startMultusDaemon(daemonConfig *types.ControllerNetConf, stopCh chan struct
return fmt.Errorf("failed to run multus-daemon with root: %v, now running in uid: %s", err, user.Uid)
}
if err := srv.FilesystemPreRequirements(daemonConfig.DaemonSocketDir); err != nil {
if err := srv.FilesystemPreRequirements(daemonConfig.SocketDir); err != nil {
return fmt.Errorf("failed to prepare the cni-socket for communicating with the shim: %w", err)
}
@@ -243,9 +243,9 @@ func startMultusDaemon(daemonConfig *types.ControllerNetConf, stopCh chan struct
}, 0, stopCh)
}
l, err := srv.GetListener(api.SocketPath(daemonConfig.DaemonSocketDir))
l, err := srv.GetListener(api.SocketPath(daemonConfig.SocketDir))
if err != nil {
return fmt.Errorf("failed to start the CNI server using socket %s. Reason: %+v", api.SocketPath(daemonConfig.DaemonSocketDir), err)
return fmt.Errorf("failed to start the CNI server using socket %s. Reason: %+v", api.SocketPath(daemonConfig.SocketDir), err)
}
server.SetKeepAlivesEnabled(false)