From f63b6772cacf3ed430069f3c8157f9121038091e Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 28 Oct 2020 21:57:40 +0100 Subject: [PATCH] Update bazel --- .../apiextensions-apiserver/pkg/apiserver/BUILD | 5 +++-- .../pkg/apiserver/schema/BUILD | 3 +++ .../pkg/apiserver/schema/defaulting/BUILD | 4 ++-- .../pkg/apiserver/validation/BUILD | 12 ++++++------ .../pkg/registry/customresource/BUILD | 2 +- test/e2e/apimachinery/BUILD | 1 + 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD index 8dc93e25911..47bc09f8316 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD @@ -89,10 +89,11 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", - "//vendor/github.com/go-openapi/strfmt:go_default_library", - "//vendor/github.com/go-openapi/validate:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/spec:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/strfmt:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/validate:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/BUILD index 058b942d7db..116b3cc9030 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/BUILD @@ -6,6 +6,7 @@ go_library( "complete.go", "convert.go", "goopenapi.go", + "kubeopenapi.go", "skeleton.go", "structural.go", "unfold.go", @@ -21,6 +22,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/spec:go_default_library", ], ) @@ -49,6 +51,7 @@ go_test( srcs = [ "convert_test.go", "goopenapi_test.go", + "kubeopenapi_test.go", "unfold_test.go", "validation_test.go", ], diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/BUILD index c5db81c3785..8c0da5f4cea 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/BUILD @@ -20,8 +20,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/github.com/go-openapi/strfmt:go_default_library", - "//vendor/github.com/go-openapi/validate:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/strfmt:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/validate:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD index d67e6f4697e..93edbdfcf8d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/BUILD @@ -18,10 +18,10 @@ go_library( "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//vendor/github.com/go-openapi/errors:go_default_library", - "//vendor/github.com/go-openapi/spec:go_default_library", - "//vendor/github.com/go-openapi/strfmt:go_default_library", - "//vendor/github.com/go-openapi/validate:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/errors:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/spec:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/strfmt:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/validate:go_default_library", ], ) @@ -55,7 +55,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/github.com/go-openapi/spec:go_default_library", - "//vendor/github.com/go-openapi/strfmt:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/spec:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/strfmt:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD index 16c05a4683b..edd2afb9a36 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/BUILD @@ -40,7 +40,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/names:go_default_library", - "//vendor/github.com/go-openapi/validate:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/validate:go_default_library", ], ) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index b43da348371..ac741f30906 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -105,6 +105,7 @@ go_library( "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/util:go_default_library", + "//vendor/k8s.io/kube-openapi/pkg/validation/spec:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", ],