upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-05-28 04:34:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix --docker with --container-runtime-endpoint

Browse source 
The container runtime endpoint value is passed into cri-dockerd as the docker socket address, so we need to check for --docker BEFORE checking for non-nil --container-runtime-endpoint.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2025-08-01 18:40:23 +00:00 committed by Brad Davidson
parent fb222e9a68
commit 3bae735fb5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/agent/config/config.go
View file

@ -731,14 +731,14 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
nodeConfig.AgentConfig.ImageServiceSocket = nodeConfig.ImageServiceEndpoint
}
if nodeConfig.ContainerRuntimeEndpoint != "" {
nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.ContainerRuntimeEndpoint
} else if nodeConfig.Docker {
if nodeConfig.Docker {
if err := applyCRIDockerdOSSpecificConfig(nodeConfig); err != nil {
return nil, err
}
nodeConfig.AgentConfig.CNIPlugin = true
nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.CRIDockerd.Address
} else if nodeConfig.ContainerRuntimeEndpoint != "" {
nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.ContainerRuntimeEndpoint
} else {
if err := applyContainerdOSSpecificConfig(nodeConfig); err != nil {
return nil, err