Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit f247a08

Browse files
committed
Fix capabilities support.
Signed-off-by: Lantao Liu <[email protected]>
1 parent e9a930b commit f247a08

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pkg/server/container_start.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,14 +467,15 @@ func setOCICapabilities(g *generate.Generator, capabilities *runtime.Capability,
467467
return nil
468468
}
469469

470+
// Capabilities in CRI doesn't have `CAP_` prefix, so add it.
470471
for _, c := range capabilities.GetAddCapabilities() {
471-
if err := g.AddProcessCapability(c); err != nil {
472+
if err := g.AddProcessCapability("CAP_" + c); err != nil {
472473
return err
473474
}
474475
}
475476

476477
for _, c := range capabilities.GetDropCapabilities() {
477-
if err := g.DropProcessCapability(c); err != nil {
478+
if err := g.DropProcessCapability("CAP_" + c); err != nil {
478479
return err
479480
}
480481
}

pkg/server/container_start_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func getStartContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxC
7777
},
7878
SecurityContext: &runtime.LinuxContainerSecurityContext{
7979
Capabilities: &runtime.Capability{
80-
AddCapabilities: []string{"CAP_SYS_ADMIN"},
81-
DropCapabilities: []string{"CAP_CHOWN"},
80+
AddCapabilities: []string{"SYS_ADMIN"},
81+
DropCapabilities: []string{"CHOWN"},
8282
},
8383
SupplementalGroups: []int64{1111, 2222},
8484
},

0 commit comments

Comments
 (0)