github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

pkg/kubelet/rkt: adapt to new appc/spec

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-01-29 18:45:01 +01:00 committed by Dr. Stefan Schimanski
parent 011d35a422
commit 88d9829ad5
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/rkt/rkt.go
View File

@ -357,14 +357,22 @@ func setIsolators(app *appctypes.App, c *v1.Container, ctx *v1.SecurityContext)
if err != nil { if err != nil {
return err return err
} }
isolators = append(isolators, set.AsIsolator()) isolator, err := set.AsIsolator()
if err != nil {
return err
}
isolators = append(isolators, *isolator)
} }
if len(dropCaps) > 0 { if len(dropCaps) > 0 {
set, err := appctypes.NewLinuxCapabilitiesRevokeSet(dropCaps...) set, err := appctypes.NewLinuxCapabilitiesRevokeSet(dropCaps...)
if err != nil { if err != nil {
return err return err
} }
isolators = append(isolators, set.AsIsolator()) isolator, err := set.AsIsolator()
if err != nil {
return err
}
isolators = append(isolators, *isolator)
} }
} }

12
pkg/kubelet/rkt/rkt_test.go
View File

@ -845,7 +845,11 @@ func generateCapRetainIsolator(t *testing.T, caps ...string) appctypes.Isolator
if err != nil { if err != nil {
t.Fatalf("Error generating cap retain isolator: %v", err) t.Fatalf("Error generating cap retain isolator: %v", err)
} }
return retain.AsIsolator() isolator, err := retain.AsIsolator()
if err != nil {
t.Fatalf("Error generating cap retain isolator: %v", err)
}
return *isolator
} }
func generateCapRevokeIsolator(t *testing.T, caps ...string) appctypes.Isolator { func generateCapRevokeIsolator(t *testing.T, caps ...string) appctypes.Isolator {
@ -853,7 +857,11 @@ func generateCapRevokeIsolator(t *testing.T, caps ...string) appctypes.Isolator
if err != nil { if err != nil {
t.Fatalf("Error generating cap revoke isolator: %v", err) t.Fatalf("Error generating cap revoke isolator: %v", err)
} }
return revoke.AsIsolator() isolator, err := revoke.AsIsolator()
if err != nil {
t.Fatalf("Error generating cap revoke isolator: %v", err)
}
return *isolator
} }
func generateCPUIsolator(t *testing.T, request, limit string) appctypes.Isolator { func generateCPUIsolator(t *testing.T, request, limit string) appctypes.Isolator {