diff --git a/go.mod b/go.mod index 72b7e9c6cff..5b509b83c84 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,6 @@ require ( github.com/emicklei/go-restful v2.9.5+incompatible github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/evanphx/json-patch v4.2.0+incompatible - github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/fatih/camelcase v1.0.0 github.com/fsnotify/fsnotify v1.4.7 github.com/go-bindata/go-bindata v3.1.1+incompatible diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index df624ede8e7..b10c281ba2b 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -117,7 +117,6 @@ filegroup( "//pkg/kubectl/proxy:all-srcs", "//pkg/kubectl/scheme:all-srcs", "//pkg/kubectl/util:all-srcs", - "//pkg/kubectl/validation:all-srcs", "//pkg/kubectl/version:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/apply/BUILD b/pkg/kubectl/cmd/apply/BUILD index 2c140af20c9..36e411ecfe1 100644 --- a/pkg/kubectl/cmd/apply/BUILD +++ b/pkg/kubectl/cmd/apply/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -38,6 +37,7 @@ go_library( "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/jonboulle/clockwork:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go index 83c2ff41b83..99e4bf57c62 100644 --- a/pkg/kubectl/cmd/apply/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -47,13 +47,13 @@ import ( "k8s.io/klog" oapi "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kubectl/pkg/util/templates" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/validation" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD index 9671b3a3957..a01fd1a16e4 100644 --- a/pkg/kubectl/cmd/convert/BUILD +++ b/pkg/kubectl/cmd/convert/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/apis/storage/install:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -36,6 +35,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/kubectl/cmd/convert/convert.go b/pkg/kubectl/cmd/convert/convert.go index 86829d40486..ab37ca43c4a 100644 --- a/pkg/kubectl/cmd/convert/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -29,11 +29,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" + "k8s.io/kubectl/pkg/validation" scheme "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/validation" ) var ( diff --git a/pkg/kubectl/cmd/replace/BUILD b/pkg/kubectl/cmd/replace/BUILD index 3d4d8b2190d..2da401f7d7b 100644 --- a/pkg/kubectl/cmd/replace/BUILD +++ b/pkg/kubectl/cmd/replace/BUILD @@ -11,13 +11,13 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/kubectl/cmd/replace/replace.go b/pkg/kubectl/cmd/replace/replace.go index 7426154eee8..b09e95ddc78 100644 --- a/pkg/kubectl/cmd/replace/replace.go +++ b/pkg/kubectl/cmd/replace/replace.go @@ -33,12 +33,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/validation" ) var ( diff --git a/pkg/kubectl/cmd/rollingupdate/BUILD b/pkg/kubectl/cmd/rollingupdate/BUILD index 58478587a0f..c5d06aaacf2 100644 --- a/pkg/kubectl/cmd/rollingupdate/BUILD +++ b/pkg/kubectl/cmd/rollingupdate/BUILD @@ -11,7 +11,6 @@ go_library( "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -23,6 +22,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go index cecf60d7fd2..d7926475b6a 100644 --- a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -35,12 +35,12 @@ import ( "k8s.io/client-go/kubernetes" scaleclient "k8s.io/client-go/scale" "k8s.io/kubectl/pkg/util/templates" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/validation" ) var ( diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index 913b8ad6678..186489998c7 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -15,7 +15,6 @@ go_library( "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/cmd/util/openapi/testing:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta/testrestmapper:go_default_library", @@ -36,6 +35,7 @@ go_library( "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index 2d3e18c5cf9..f840f5fcca5 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -44,12 +44,12 @@ import ( scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing" "k8s.io/kubernetes/pkg/kubectl/scheme" - "k8s.io/kubernetes/pkg/kubectl/validation" ) // InternalType is the schema for internal type diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 387278c9124..cd43375d1f0 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -16,7 +16,6 @@ go_library( "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/cmd/util/openapi/validation:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/validation:go_default_library", "//pkg/kubectl/version:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -37,6 +36,7 @@ go_library( "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/evanphx/json-patch:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 73c88a69e8e..f8e38665456 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -23,8 +23,8 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/validation" ) // Factory provides abstractions that allow the Kubectl command to be extended across multiple types diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go index 85a5cdf02f5..ba67de8fdea 100644 --- a/pkg/kubectl/cmd/util/factory_client_access.go +++ b/pkg/kubectl/cmd/util/factory_client_access.go @@ -30,9 +30,9 @@ import ( "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" openapivalidation "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/validation" - "k8s.io/kubernetes/pkg/kubectl/validation" ) type factoryImpl struct { diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 1794e1935be..00ad4ffc7fa 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -25,6 +25,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/storage:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 810d85b70c5..03dca6bca1a 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -8,6 +8,7 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/mitchellh/go-wordwrap v1.0.0 github.com/pkg/errors v0.8.0 // indirect diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index 44a69ffea29..030f118b28c 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -21,6 +21,8 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM= github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= diff --git a/pkg/kubectl/validation/BUILD b/staging/src/k8s.io/kubectl/pkg/validation/BUILD similarity index 54% rename from pkg/kubectl/validation/BUILD rename to staging/src/k8s.io/kubectl/pkg/validation/BUILD index 76d0bbb697f..5bf5b88c008 100644 --- a/pkg/kubectl/validation/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/validation/BUILD @@ -1,45 +1,34 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -exports_files( - srcs = [ - "testdata/v1/validPod.yaml", - ], - visibility = ["//build/visible_to:COMMON_testing"], -) - -go_test( - name = "go_default_test", - srcs = ["schema_test.go"], - data = [ - ":testdata", - ], - embed = [":go_default_library"], -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["schema.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/validation", - visibility = ["//build/visible_to:pkg_kubectl_validation_CONSUMERS"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/validation", + importpath = "k8s.io/kubectl/pkg/validation", + visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/github.com/exponent-io/jsonpath:go_default_library", ], ) +go_test( + name = "go_default_test", + srcs = ["schema_test.go"], + data = glob(["testdata/**"]), + embed = [":go_default_library"], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), tags = ["automanaged"], + visibility = ["//visibility:private"], ) filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], - visibility = ["//build/visible_to:pkg_kubectl_validation_CONSUMERS"], + visibility = ["//visibility:public"], ) diff --git a/pkg/kubectl/validation/schema.go b/staging/src/k8s.io/kubectl/pkg/validation/schema.go similarity index 100% rename from pkg/kubectl/validation/schema.go rename to staging/src/k8s.io/kubectl/pkg/validation/schema.go diff --git a/pkg/kubectl/validation/schema_test.go b/staging/src/k8s.io/kubectl/pkg/validation/schema_test.go similarity index 100% rename from pkg/kubectl/validation/schema_test.go rename to staging/src/k8s.io/kubectl/pkg/validation/schema_test.go diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod.yaml b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod.yaml similarity index 100% rename from pkg/kubectl/validation/testdata/v1/invalidPod.yaml rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod.yaml diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod1.json b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod1.json similarity index 100% rename from pkg/kubectl/validation/testdata/v1/invalidPod1.json rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod1.json diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod2.json b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod2.json similarity index 100% rename from pkg/kubectl/validation/testdata/v1/invalidPod2.json rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod2.json diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod3.json b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod3.json similarity index 100% rename from pkg/kubectl/validation/testdata/v1/invalidPod3.json rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod3.json diff --git a/pkg/kubectl/validation/testdata/v1/invalidPod4.yaml b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod4.yaml similarity index 100% rename from pkg/kubectl/validation/testdata/v1/invalidPod4.yaml rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/invalidPod4.yaml diff --git a/pkg/kubectl/validation/testdata/v1/validPod.yaml b/staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/validPod.yaml similarity index 100% rename from pkg/kubectl/validation/testdata/v1/validPod.yaml rename to staging/src/k8s.io/kubectl/pkg/validation/testdata/v1/validPod.yaml diff --git a/vendor/modules.txt b/vendor/modules.txt index 08e0d554a2b..5c514dd91cf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1654,6 +1654,7 @@ k8s.io/kubectl/pkg/util/slice k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term +k8s.io/kubectl/pkg/validation # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1beta1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers