diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index 5e7a2acd9c1..25f75fbfd1c 100644 --- a/pkg/api/validation/BUILD +++ b/pkg/api/validation/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/api/service:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/security/apparmor:go_default_library", @@ -36,6 +35,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/errors", diff --git a/pkg/api/validation/genericvalidation/BUILD b/pkg/api/validation/genericvalidation/BUILD index b0048140b92..c88dcca65b7 100644 --- a/pkg/api/validation/genericvalidation/BUILD +++ b/pkg/api/validation/genericvalidation/BUILD @@ -18,8 +18,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", diff --git a/pkg/api/validation/genericvalidation/validation.go b/pkg/api/validation/genericvalidation/validation.go index 21d7b9c009f..84e769c9878 100644 --- a/pkg/api/validation/genericvalidation/validation.go +++ b/pkg/api/validation/genericvalidation/validation.go @@ -21,13 +21,13 @@ import ( "strings" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + v1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - v1validation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" ) // TODO: delete this global variable when we enable the validation of common diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 7af6742aa58..fca61370bf2 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -29,6 +29,7 @@ import ( "github.com/golang/glog" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" @@ -38,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/security/apparmor" diff --git a/pkg/apis/apps/validation/BUILD b/pkg/apis/apps/validation/BUILD index a8e1f32f70c..fe92b597064 100644 --- a/pkg/apis/apps/validation/BUILD +++ b/pkg/apis/apps/validation/BUILD @@ -16,8 +16,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/pkg/apis/apps/validation/validation.go b/pkg/apis/apps/validation/validation.go index 642b52a6534..7459339950c 100644 --- a/pkg/apis/apps/validation/validation.go +++ b/pkg/apis/apps/validation/validation.go @@ -20,12 +20,12 @@ import ( "reflect" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/apps" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" ) // ValidateStatefulSetName can be used to check whether the given StatefulSet name is valid. diff --git a/pkg/apis/batch/validation/BUILD b/pkg/apis/batch/validation/BUILD index 923bc74b459..03203a2ec1f 100644 --- a/pkg/apis/batch/validation/BUILD +++ b/pkg/apis/batch/validation/BUILD @@ -16,9 +16,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//vendor:github.com/robfig/cron", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index 35ade35be02..51f6b250a0c 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -20,12 +20,12 @@ import ( "github.com/robfig/cron" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/batch" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" ) // TODO: generalize for other controller objects that will follow the same pattern, such as ReplicaSet and DaemonSet, and diff --git a/pkg/apis/extensions/validation/BUILD b/pkg/apis/extensions/validation/BUILD index 2b57c64277a..18904c80f5e 100644 --- a/pkg/apis/extensions/validation/BUILD +++ b/pkg/apis/extensions/validation/BUILD @@ -16,12 +16,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/validation", diff --git a/pkg/apis/extensions/validation/validation.go b/pkg/apis/extensions/validation/validation.go index 3c46816b350..d6762d6d346 100644 --- a/pkg/apis/extensions/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -25,6 +25,7 @@ import ( "strings" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/api" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" diff --git a/pkg/apis/meta/v1/BUILD b/pkg/apis/meta/v1/BUILD index cefb7561023..6a20617e118 100644 --- a/pkg/apis/meta/v1/BUILD +++ b/pkg/apis/meta/v1/BUILD @@ -77,7 +77,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/apis/meta/v1/unstructured:all-srcs", - "//pkg/apis/meta/v1/validation:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/apis/meta/v1/validation/BUILD b/pkg/apis/meta/v1/validation/BUILD deleted file mode 100644 index f50a684b278..00000000000 --- a/pkg/apis/meta/v1/validation/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = ["validation.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/util/validation", - "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - ], -) - -go_test( - name = "go_default_test", - srcs = ["validation_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apimachinery/pkg/util/validation/field"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/apis/policy/validation/BUILD b/pkg/apis/policy/validation/BUILD index 5bd90accebd..507406ebea8 100644 --- a/pkg/apis/policy/validation/BUILD +++ b/pkg/apis/policy/validation/BUILD @@ -15,8 +15,8 @@ go_library( deps = [ "//pkg/api/validation:go_default_library", "//pkg/apis/extensions/validation:go_default_library", - "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/apis/policy:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/policy/validation/validation.go b/pkg/apis/policy/validation/validation.go index 96faf844159..88471b416ec 100644 --- a/pkg/apis/policy/validation/validation.go +++ b/pkg/apis/policy/validation/validation.go @@ -19,10 +19,10 @@ package validation import ( "reflect" + unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/util/validation/field" apivalidation "k8s.io/kubernetes/pkg/api/validation" extensionsvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/apis/policy" ) diff --git a/pkg/apis/meta/v1/validation/validation.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation.go similarity index 100% rename from pkg/apis/meta/v1/validation/validation.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation.go diff --git a/pkg/apis/meta/v1/validation/validation_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation_test.go similarity index 100% rename from pkg/apis/meta/v1/validation/validation_test.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation_test.go diff --git a/vendor/BUILD b/vendor/BUILD index eb511d7e73a..4010a480fc2 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13322,3 +13322,22 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/apis/meta/v1/validation_test", + srcs = ["k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation_test.go"], + library = ":k8s.io/apimachinery/pkg/apis/meta/v1/validation", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/util/validation/field"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/apis/meta/v1/validation", + srcs = ["k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation.go"], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/validation", + "//vendor:k8s.io/apimachinery/pkg/util/validation/field", + ], +)