vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move duplicated consts to apparmor_common.go

Browse source 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
This commit is contained in:
Xianglin Gao 2016-12-07 20:46:38 +08:00
parent cb5ed1ce9d
commit 6977b3e88d
3 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/apparmor/apparmor_common.go Normal file
View file

@ -0,0 +1,14 @@
package apparmor
const (
// DefaultApparmorProfile is the name of default apparmor profile name.
DefaultApparmorProfile = "ocid-default"
// ContainerAnnotationKeyPrefix is the prefix to an annotation key specifying a container profile.
ContainerAnnotationKeyPrefix = "container.apparmor.security.beta.kubernetes.io/"
// ProfileRuntimeDefault is he profile specifying the runtime default.
ProfileRuntimeDefault = "runtime/default"
// ProfileNamePrefix is the prefix for specifying profiles loaded on the node.
ProfileNamePrefix = "localhost/"
)

11
server/apparmor/apparmor.go → server/apparmor/apparmor_supported.go
View file

@ -17,20 +17,9 @@ import (
) )
const ( const (
// DefaultApparmorProfile is the name of default apparmor profile name.
DefaultApparmorProfile = "ocid-default"
// profileDirectory is the file store for apparmor profiles and macros. // profileDirectory is the file store for apparmor profiles and macros.
profileDirectory = "/etc/apparmor.d" profileDirectory = "/etc/apparmor.d"
// ContainerAnnotationKeyPrefix is the prefix to an annotation key specifying a container profile.
ContainerAnnotationKeyPrefix = "container.apparmor.security.beta.kubernetes.io/"
// ProfileRuntimeDefault is he profile specifying the runtime default.
ProfileRuntimeDefault = "runtime/default"
// ProfileNamePrefix is the prefix for specifying profiles loaded on the node.
ProfileNamePrefix = "localhost/"
// readConfigTimeout is the timeout of reading apparmor profiles. // readConfigTimeout is the timeout of reading apparmor profiles.
readConfigTimeout = 10 readConfigTimeout = 10
) )

13
server/apparmor/apparmor_unsupported.go
View file

@ -2,19 +2,6 @@
package apparmor package apparmor
const (
// DefaultApparmorProfile is the name of default apparmor profile name.
DefaultApparmorProfile = "ocid-default"
// ContainerAnnotationKeyPrefix is the prefix to an annotation key specifying a container profile.
ContainerAnnotationKeyPrefix = "container.apparmor.security.beta.kubernetes.io/"
// ProfileRuntimeDefault is he profile specifying the runtime default.
ProfileRuntimeDefault = "runtime/default"
// ProfileNamePrefix is the prefix for specifying profiles loaded on the node.
ProfileNamePrefix = "localhost/"
)
// IsEnabled returns false, when build without apparmor build tag. // IsEnabled returns false, when build without apparmor build tag.
func IsEnabled() bool { func IsEnabled() bool {
return false return false