k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow agent to run rootless 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/6517/head
Brad Davidson 2022-11-15 08:44:35 +00:00 committed by Brad Davidson
parent 6f2b21c5cd
commit 56bf7d6ad3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cli/agent/agent.go
View File

@ -33,8 +33,8 @@ func Run(ctx *cli.Context) error {
return err
}
if os.Getuid() != 0 && runtime.GOOS != "windows" {
return fmt.Errorf("agent must be ran as root")
if runtime.GOOS != "windows" && os.Getuid() != 0 && !cmds.AgentConfig.Rootless {
return fmt.Errorf("agent must be run as root, or with --rootless")
}
if cmds.AgentConfig.TokenFile != "" {

2
pkg/cli/server/server.go
View File

@ -71,7 +71,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
}
if !cfg.DisableAgent && os.Getuid() != 0 && !cfg.Rootless {
return fmt.Errorf("must run as root unless --disable-agent is specified")
return fmt.Errorf("server must run as root, or with --rootless and/or --disable-agent")
}
if cfg.Rootless {