Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daemon.NewDaemon(): fix network feature detection on first start #43689

Merged
merged 1 commit into from
Jun 3, 2022
Merged

daemon.NewDaemon(): fix network feature detection on first start #43689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,13 +1005,15 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
return nil, err
}

sysInfo := d.RawSysInfo()
for _, w := range sysInfo.Warnings {
logrus.Warn(w)
}
// Check if Devices cgroup is mounted, it is hard requirement for container security,
// on Linux.
if runtime.GOOS == "linux" && !sysInfo.CgroupDevicesEnabled && !userns.RunningInUserNS() {
//
// Important: we call getSysInfo() directly here, without storing the results,
// as networking has not yet been set up, so we only have partial system info
// at this point.
//
// TODO(thaJeztah) add a utility to only collect the CgroupDevicesEnabled information
if runtime.GOOS == "linux" && !userns.RunningInUserNS() && !getSysInfo(d).CgroupDevicesEnabled {
return nil, errors.New("Devices cgroup isn't mounted")
}

Expand Down Expand Up @@ -1096,6 +1098,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
close(d.startupDone)

info := d.SystemInfo()
for _, w := range info.Warnings {
logrus.Warn(w)
}

engineInfo.WithValues(
dockerversion.Version,
Expand Down Expand Up @@ -1487,7 +1492,7 @@ func (daemon *Daemon) RawSysInfo() *sysinfo.SysInfo {
// We check if sysInfo is not set here, to allow some test to
// override the actual sysInfo.
if daemon.sysInfo == nil {
daemon.loadSysInfo()
daemon.sysInfo = getSysInfo(daemon)
}
})

Expand Down
4 changes: 2 additions & 2 deletions daemon/daemon_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,14 +1726,14 @@ func (daemon *Daemon) setupSeccompProfile() error {
return nil
}

func (daemon *Daemon) loadSysInfo() {
func getSysInfo(daemon *Daemon) *sysinfo.SysInfo {
var siOpts []sysinfo.Opt
if daemon.getCgroupDriver() == cgroupSystemdDriver {
if euid := os.Getenv("ROOTLESSKIT_PARENT_EUID"); euid != "" {
siOpts = append(siOpts, sysinfo.WithCgroup2GroupPath("/user.slice/user-"+euid+".slice"))
}
}
daemon.sysInfo = sysinfo.New(siOpts...)
return sysinfo.New(siOpts...)
}

func (daemon *Daemon) initLibcontainerd(ctx context.Context) error {
Expand Down
4 changes: 2 additions & 2 deletions daemon/daemon_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ const platformSupported = false
func setupResolvConf(config *config.Config) {
}

func (daemon *Daemon) loadSysInfo() {
daemon.sysInfo = sysinfo.New()
func getSysInfo(daemon *Daemon) *sysinfo.SysInfo {
return sysinfo.New()
}
4 changes: 2 additions & 2 deletions daemon/daemon_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,8 @@ func (daemon *Daemon) loadRuntimes() error {

func setupResolvConf(config *config.Config) {}

func (daemon *Daemon) loadSysInfo() {
daemon.sysInfo = sysinfo.New()
func getSysInfo(daemon *Daemon) *sysinfo.SysInfo {
return sysinfo.New()
}

func (daemon *Daemon) initLibcontainerd(ctx context.Context) error {
Expand Down