Refactor: pkg/util into sub-pkgs

This commit is contained in:
xiangpengzhao
2017-06-29 16:39:26 +08:00
parent 50ec4384ff
commit 01daf707c5
47 changed files with 313 additions and 284 deletions

View File

@@ -17,7 +17,7 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/features:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/file:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
],

View File

@@ -28,7 +28,7 @@ import (
"k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/util"
utilfile "k8s.io/kubernetes/pkg/util/file"
)
// Whether AppArmor should be disabled by default.
@@ -194,7 +194,7 @@ func getAppArmorFS() (string, error) {
}
if fields[2] == "securityfs" {
appArmorFS := path.Join(fields[1], "apparmor")
if ok, err := util.FileExists(appArmorFS); !ok {
if ok, err := utilfile.FileExists(appArmorFS); !ok {
msg := fmt.Sprintf("path %s does not exist", appArmorFS)
if err != nil {
return "", fmt.Errorf("%s: %v", msg, err)