Skip to content

K
k3s
Commit e60f7ecc authored by Oleg Matskiv's avatar Oleg Matskiv Committed by Brad Davidson
Browse files
Options

Don't verify the node password if the local host is not running an agent

Signed-off-by: 's avatarOleg Matskiv <oleg.matskiv@gmail.com> (cherry picked from commit e3b237fc) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent b1453351
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
pkg/server/router.go
View file @ e60f7ecc
...@@ -488,6 +488,11 @@ func passwordBootstrap(ctx context.Context, config *Config) nodePassBootstrapper ...@@ -488,6 +488,11 @@ func passwordBootstrap(ctx context.Context, config *Config) nodePassBootstrapper
} }
func verifyLocalPassword(ctx context.Context, config *Config, mu *sync.Mutex, deferredNodes map[string]bool, node *nodeInfo) (string, int, error) { func verifyLocalPassword(ctx context.Context, config *Config, mu *sync.Mutex, deferredNodes map[string]bool, node *nodeInfo) (string, int, error) {
// do not attempt to verify the node password if the local host is not running an agent and does not have a node resource.
if config.DisableAgent {
return node.Name, http.StatusOK, nil
}
// use same password file location that the agent creates // use same password file location that the agent creates
nodePasswordRoot := "/" nodePasswordRoot := "/"
if config.ControlConfig.Rootless { if config.ControlConfig.Rootless {
......
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