Commit 88d9829a authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski Committed by Dr. Stefan Schimanski

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

parent 011d35a4
...@@ -357,14 +357,22 @@ func setIsolators(app *appctypes.App, c *v1.Container, ctx *v1.SecurityContext) ...@@ -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)
} }
} }
......
...@@ -845,7 +845,11 @@ func generateCapRetainIsolator(t *testing.T, caps ...string) appctypes.Isolator ...@@ -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 ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment