Skip to content

Commit

Permalink
Allow additional Rootless CopyUpDirs through K3S_ROOTLESS_COPYUPDIRS …
Browse files Browse the repository at this point in the history
…env variable (#10386)

Signed-off-by: Ludo Stellingwerff <ludo.stellingwerff@gmail.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
  • Loading branch information
ludost authored and dereknola committed Oct 9, 2024
1 parent efa2804 commit 7f4c719
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkg/rootless/rootless.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var (
enableIPv6Env = "K3S_ROOTLESS_ENABLE_IPV6"
portDriverEnv = "K3S_ROOTLESS_PORT_DRIVER"
disableLoopbackEnv = "K3S_ROOTLESS_DISABLE_HOST_LOOPBACK"
copyUpDirsEnv = "K3S_ROOTLESS_COPYUPDIRS"
)

func Rootless(stateDir string, enableIPv6 bool) error {
Expand Down Expand Up @@ -218,6 +219,9 @@ func createChildOpt(driver portDriver) (*child.Opt, error) {
opt.NetworkDriver = slirp4netns.NewChildDriver()
opt.PortDriver = driver.NewChildDriver()
opt.CopyUpDirs = []string{"/etc", "/var/run", "/run", "/var/lib"}
if copyUpDirs := os.Getenv(copyUpDirsEnv); copyUpDirs != "" {
opt.CopyUpDirs = append(opt.CopyUpDirs, strings.Split(copyUpDirs, ",")...)
}
opt.CopyUpDriver = tmpfssymlink.NewChildDriver()
opt.MountProcfs = true
opt.Reaper = true
Expand Down

0 comments on commit 7f4c719

Please sign in to comment.