@@ -27,6 +27,7 @@ import (
27
27
"github.com/kubernetes-sigs/cri-tools/pkg/framework"
28
28
internalapi "k8s.io/cri-api/pkg/apis"
29
29
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
30
+ "k8s.io/kubernetes/pkg/security/apparmor"
30
31
31
32
"github.com/golang/glog"
32
33
. "github.com/onsi/ginkgo"
@@ -58,7 +59,7 @@ var _ = framework.KubeDescribe("AppArmor", func() {
58
59
var rc internalapi.RuntimeService
59
60
var ic internalapi.ImageManagerService
60
61
61
- if isAppArmorEnabled () {
62
+ if apparmor . IsAppArmorEnabled () {
62
63
BeforeEach (func () {
63
64
rc = f .CRIClient .CRIRuntimeClient
64
65
ic = f .CRIClient .CRIImageClient
@@ -177,18 +178,3 @@ func loadTestProfiles() error {
177
178
glog .V (2 ).Infof ("Loaded profiles: %v" , out )
178
179
return nil
179
180
}
180
-
181
- // isAppArmorEnabled returns true if apparmor is enabled for the host.
182
- // This function is forked from
183
- // https://github.com/opencontainers/runc/blob/1a81e9ab1f138c091fe5c86d0883f87716088527/libcontainer/apparmor/apparmor.go
184
- // to avoid the libapparmor dependency.
185
- // TODO: replace with k8s.io/kubernetes/pkg/security/apparmor when vendor is possible.
186
- func isAppArmorEnabled () bool {
187
- if _ , err := os .Stat ("/sys/kernel/security/apparmor" ); err == nil && os .Getenv ("container" ) == "" {
188
- if _ , err = os .Stat ("/sbin/apparmor_parser" ); err == nil {
189
- buf , err := ioutil .ReadFile ("/sys/module/apparmor/parameters/enabled" )
190
- return err == nil && len (buf ) > 1 && buf [0 ] == 'Y'
191
- }
192
- }
193
- return false
194
- }
0 commit comments