Skip to content

K
k3s
Commit 4fb073e7 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Log clearer error on startup if NPC cannot be started

Servers should always be upgraded before agents, but generally this isn't required because things are compatible between versions. In this case we're OK with failing closed if the user upgrades out of order, but we should give a clearer message about what steps are required to fix the issue. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 7734015d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
pkg/agent/config/config.go
View file @ 4fb073e7
...@@ -498,6 +498,13 @@ func get(envInfo *cmds.Agent, proxy proxy.Proxy) (*config.Node, error) { ...@@ -498,6 +498,13 @@ func get(envInfo *cmds.Agent, proxy proxy.Proxy) (*config.Node, error) {
nodeConfig.AgentConfig.ServiceNodePortRange = *controlConfig.ServiceNodePortRange nodeConfig.AgentConfig.ServiceNodePortRange = *controlConfig.ServiceNodePortRange
} }
// Old versions of the server do not send enough information to correctly start the NPC. Users
// need to upgrade the server to at least the same version as the agent, or disable the NPC
// cluster-wide.
if controlConfig.DisableNPC == false && (controlConfig.ServiceIPRange == nil || controlConfig.ServiceNodePortRange == nil) {
return nil, fmt.Errorf("incompatible down-level server detected; servers must be upgraded to at least %s, or restarted with --disable-network-policy", version.Version)
}
nodeConfig.AgentConfig.ExtraKubeletArgs = envInfo.ExtraKubeletArgs nodeConfig.AgentConfig.ExtraKubeletArgs = envInfo.ExtraKubeletArgs
nodeConfig.AgentConfig.ExtraKubeProxyArgs = envInfo.ExtraKubeProxyArgs nodeConfig.AgentConfig.ExtraKubeProxyArgs = envInfo.ExtraKubeProxyArgs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment