Skip to content

add option for containerd non-root device usage flag #499

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

Merged
merged 2 commits into from
Jul 24, 2025
Merged

add option for containerd non-root device usage flag #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f1bd02
add option for containerd non-root device usage flag
soer3n Jul 24, 2025
71b665c
update test fixtures
soer3n Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions cmd/osm-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,11 @@ type options struct {
workerMetricsAddress string

// Flags for configuring CRI
nodeInsecureRegistries string
nodeRegistryMirrors string
nodeRegistryCredentialsSecret string
nodeContainerdRegistryMirrors containerruntime.RegistryMirrorsFlags
nodeInsecureRegistries string
nodeRegistryMirrors string
nodeRegistryCredentialsSecret string
nodeContainerdRegistryMirrors containerruntime.RegistryMirrorsFlags
deviceOwnershipFromSecurityContext bool

// Flags for proxy
nodeHTTPProxy string
Expand Down Expand Up @@ -130,6 +131,7 @@ func main() {
flag.StringVar(&opt.nodeNoProxy, "node-no-proxy", ".svc,.cluster.local,localhost,127.0.0.1", "If set, it configures the 'NO_PROXY' environment variable on the nodes.")
flag.StringVar(&opt.nodeInsecureRegistries, "node-insecure-registries", "", "Comma separated list of registries which should be configured as insecure on the container runtime")
flag.StringVar(&opt.nodeRegistryMirrors, "node-registry-mirrors", "", "Comma separated list of Docker image mirrors")
flag.BoolVar(&opt.deviceOwnershipFromSecurityContext, "device-ownership-from-security-context", false, "Enable non-root device usage")

if opt.nodeContainerdRegistryMirrors == nil {
opt.nodeContainerdRegistryMirrors = containerruntime.RegistryMirrorsFlags{}
Expand Down Expand Up @@ -216,12 +218,13 @@ func main() {

// Build container-runtime configuration
containerRuntimeOpts := containerruntime.Opts{
ContainerRuntime: opt.containerRuntime,
ContainerdRegistryMirrors: opt.nodeContainerdRegistryMirrors,
InsecureRegistries: opt.nodeInsecureRegistries,
PauseImage: opt.pauseImage,
RegistryMirrors: opt.nodeRegistryMirrors,
RegistryCredentialsSecret: opt.nodeRegistryCredentialsSecret,
ContainerRuntime: opt.containerRuntime,
ContainerdRegistryMirrors: opt.nodeContainerdRegistryMirrors,
InsecureRegistries: opt.nodeInsecureRegistries,
PauseImage: opt.pauseImage,
RegistryMirrors: opt.nodeRegistryMirrors,
RegistryCredentialsSecret: opt.nodeRegistryCredentialsSecret,
DeviceOwnershipFromSecurityContext: opt.deviceOwnershipFromSecurityContext,
}
containerRuntimeConfig, err := containerruntime.BuildConfig(containerRuntimeOpts)
if err != nil {
Expand Down
16 changes: 9 additions & 7 deletions pkg/containerruntime/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ import (
)

type Opts struct {
ContainerRuntime string
ContainerdVersion string
InsecureRegistries string
RegistryMirrors string
RegistryCredentialsSecret string
PauseImage string
ContainerdRegistryMirrors RegistryMirrorsFlags
ContainerRuntime string
ContainerdVersion string
InsecureRegistries string
RegistryMirrors string
RegistryCredentialsSecret string
PauseImage string
ContainerdRegistryMirrors RegistryMirrorsFlags
DeviceOwnershipFromSecurityContext bool
}

type DockerCfgJSON struct {
Expand Down Expand Up @@ -98,6 +99,7 @@ func BuildConfig(opts Opts) (Config, error) {
withRegistryMirrors(opts.ContainerdRegistryMirrors),
withSandboxImage(opts.PauseImage),
withContainerdVersion(opts.ContainerdVersion),
withDeviceOwnershipFromSecurityContext(opts.DeviceOwnershipFromSecurityContext),
), nil
}

Expand Down
21 changes: 12 additions & 9 deletions pkg/containerruntime/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ import (
)

type Containerd struct {
insecureRegistries []string
registryMirrors map[string][]string
sandboxImage string
registryCredentials map[string]AuthConfig
version string
insecureRegistries []string
registryMirrors map[string][]string
sandboxImage string
registryCredentials map[string]AuthConfig
version string
deviceOwnershipFromSecurityContext bool
}

func (eng *Containerd) ConfigFileName() string {
Expand Down Expand Up @@ -63,9 +64,10 @@ type containerdMetrics struct {
}

type containerdCRIPlugin struct {
Containerd *containerdCRISettings `toml:"containerd"`
Registry *containerdCRIRegistry `toml:"registry"`
SandboxImage string `toml:"sandbox_image,omitempty"`
Containerd *containerdCRISettings `toml:"containerd"`
Registry *containerdCRIRegistry `toml:"registry"`
SandboxImage string `toml:"sandbox_image,omitempty"`
DeviceOwnershipFromSecurityContext bool `toml:"device_ownership_from_security_context"`
}

type containerdCRISettings struct {
Expand Down Expand Up @@ -101,7 +103,8 @@ type containerdRegistryTLSConfig struct {

func (eng *Containerd) Config() (string, error) {
criPlugin := containerdCRIPlugin{
SandboxImage: eng.sandboxImage,
SandboxImage: eng.sandboxImage,
DeviceOwnershipFromSecurityContext: eng.deviceOwnershipFromSecurityContext,
Containerd: &containerdCRISettings{
Runtimes: map[string]containerdCRIRuntime{
"runc": {
Expand Down
34 changes: 21 additions & 13 deletions pkg/containerruntime/containerruntime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ func withContainerdVersion(version string) Opt {
}
}

func withDeviceOwnershipFromSecurityContext(deviceOwnershipFromSecurityContext bool) Opt {
return func(cfg *Config) {
cfg.DeviceOwnershipFromSecurityContext = deviceOwnershipFromSecurityContext
}
}

func get(_ string, opts ...Opt) Config {
cfg := Config{}
cfg.Containerd = &Containerd{}
Expand All @@ -67,14 +73,15 @@ func get(_ string, opts ...Opt) Config {
}

type Config struct {
Containerd *Containerd `json:",omitempty"`
InsecureRegistries []string `json:",omitempty"`
RegistryMirrors map[string][]string `json:",omitempty"`
RegistryCredentials map[string]AuthConfig `json:",omitempty"`
SandboxImage string `json:",omitempty"`
ContainerLogMaxFiles string `json:",omitempty"`
ContainerLogMaxSize string `json:",omitempty"`
ContainerdVersion string `json:",omitempty"`
Containerd *Containerd `json:",omitempty"`
InsecureRegistries []string `json:",omitempty"`
RegistryMirrors map[string][]string `json:",omitempty"`
RegistryCredentials map[string]AuthConfig `json:",omitempty"`
SandboxImage string `json:",omitempty"`
ContainerLogMaxFiles string `json:",omitempty"`
ContainerLogMaxSize string `json:",omitempty"`
ContainerdVersion string `json:",omitempty"`
DeviceOwnershipFromSecurityContext bool `json:",omitempty"`
}

// AuthConfig is a COPY of github.com/containerd/containerd/pkg/cri/config.AuthConfig.
Expand All @@ -98,11 +105,12 @@ func (cfg Config) String() string {

func (cfg Config) Engine() Engine {
containerd := &Containerd{
insecureRegistries: cfg.InsecureRegistries,
registryMirrors: cfg.RegistryMirrors,
sandboxImage: cfg.SandboxImage,
registryCredentials: cfg.RegistryCredentials,
version: cfg.ContainerdVersion,
insecureRegistries: cfg.InsecureRegistries,
registryMirrors: cfg.RegistryMirrors,
sandboxImage: cfg.SandboxImage,
registryCredentials: cfg.RegistryCredentials,
version: cfg.ContainerdVersion,
deviceOwnershipFromSecurityContext: cfg.DeviceOwnershipFromSecurityContext,
}
return containerd
}
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ spec:
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "192.168.100.100:5000/kubernetes/pause:v3.1"
device_ownership_from_security_context = false
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-osc-rhel-8.x-cloud-init-modules-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-provisioning.yaml
View file
Open in desktop

Large diffs are not rendered by default.