From 3bae735fb55f0e67f71d0cc903f3ed0d9845128e Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 1 Aug 2025 18:40:23 +0000 Subject: [PATCH] Fix --docker with --container-runtime-endpoint 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 --- pkg/agent/config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go index 5eae845ca67..8fdb9b98113 100644 --- a/pkg/agent/config/config.go +++ b/pkg/agent/config/config.go @@ -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