From 97101a6a86ea54959aa0eb20f3154f2d5fc290d6 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 27 Sep 2018 13:05:44 +0200 Subject: [PATCH] e2e: update bazel BUILD files Generated via hack/update-bazel.sh. --- test/e2e/BUILD | 6 ++- test/e2e/framework/BUILD | 34 +++------------ test/e2e/framework/ingress/BUILD | 42 ++++++++++++++++++ test/e2e/framework/providers/aws/BUILD | 32 ++++++++++++++ test/e2e/framework/providers/azure/BUILD | 28 ++++++++++++ test/e2e/framework/providers/gce/BUILD | 48 +++++++++++++++++++++ test/e2e/framework/providers/kubemark/BUILD | 30 +++++++++++++ test/e2e/network/BUILD | 2 + test/e2e/network/scale/BUILD | 2 + test/e2e/network/scale/localrun/BUILD | 2 + test/e2e/scheduling/BUILD | 1 + test/e2e/storage/BUILD | 1 + test/e2e/upgrades/BUILD | 2 + 13 files changed, 201 insertions(+), 29 deletions(-) create mode 100644 test/e2e/framework/ingress/BUILD create mode 100644 test/e2e/framework/providers/aws/BUILD create mode 100644 test/e2e/framework/providers/azure/BUILD create mode 100644 test/e2e/framework/providers/gce/BUILD create mode 100644 test/e2e/framework/providers/kubemark/BUILD diff --git a/test/e2e/BUILD b/test/e2e/BUILD index ffc1b68a627..a7f1864dc93 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -46,8 +46,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e", deps = [ "//pkg/api/v1/pod:go_default_library", - "//pkg/cloudprovider/providers/azure:go_default_library", - "//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/version:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1beta1:go_default_library", @@ -63,6 +61,10 @@ go_library( "//test/e2e/framework:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/framework/metrics:go_default_library", + "//test/e2e/framework/providers/aws:go_default_library", + "//test/e2e/framework/providers/azure:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", + "//test/e2e/framework/providers/kubemark:go_default_library", "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/manifest:go_default_library", "//test/utils:go_default_library", diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 465d6c8ad0e..11b184cb7f4 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -1,10 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", @@ -14,13 +10,11 @@ go_library( "crd_util.go", "deployment_util.go", "exec_util.go", - "firewall_util.go", "flake_reporting_util.go", "framework.go", "get-kubemark-resource-usage.go", "google_compute.go", "gpu_util.go", - "ingress_utils.go", "jobs_util.go", "kubelet_stats.go", "log_size_monitoring.go", @@ -30,6 +24,7 @@ go_library( "perf_util.go", "pods.go", "profile_gatherer.go", + "provider.go", "psp_util.go", "pv_util.go", "rc_util.go", @@ -53,9 +48,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/conditions:go_default_library", - "//pkg/cloudprovider/providers/aws:go_default_library", - "//pkg/cloudprovider/providers/azure:go_default_library", - "//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/controller/job:go_default_library", @@ -70,7 +62,6 @@ go_library( "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/sysctl:go_default_library", "//pkg/kubelet/util/format:go_default_library", - "//pkg/kubemark:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/scheduler/cache:go_default_library", @@ -117,7 +108,6 @@ go_library( "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/discovery/cached:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", - "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:go_default_library", @@ -131,21 +121,14 @@ go_library( "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", - "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/csi-api/pkg/client/clientset/versioned:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/framework/metrics:go_default_library", - "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/manifest:go_default_library", "//test/e2e/perftype:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", - "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", - "//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library", - "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", - "//vendor/github.com/aws/aws-sdk-go/service/autoscaling:go_default_library", - "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo/config:go_default_library", @@ -155,8 +138,6 @@ go_library( "//vendor/github.com/prometheus/common/model:go_default_library", "//vendor/golang.org/x/crypto/ssh:go_default_library", "//vendor/golang.org/x/net/websocket:go_default_library", - "//vendor/google.golang.org/api/compute/v1:go_default_library", - "//vendor/google.golang.org/api/googleapi:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", ], ) @@ -174,16 +155,15 @@ filegroup( ":package-srcs", "//test/e2e/framework/config:all-srcs", "//test/e2e/framework/ginkgowrapper:all-srcs", + "//test/e2e/framework/ingress:all-srcs", "//test/e2e/framework/metrics:all-srcs", + "//test/e2e/framework/providers/aws:all-srcs", + "//test/e2e/framework/providers/azure:all-srcs", + "//test/e2e/framework/providers/gce:all-srcs", + "//test/e2e/framework/providers/kubemark:all-srcs", "//test/e2e/framework/testfiles:all-srcs", "//test/e2e/framework/timer:all-srcs", "//test/e2e/framework/viperconfig:all-srcs", ], tags = ["automanaged"], ) - -go_test( - name = "go_default_test", - srcs = ["firewall_util_test.go"], - embed = [":go_default_library"], -) diff --git a/test/e2e/framework/ingress/BUILD b/test/e2e/framework/ingress/BUILD new file mode 100644 index 00000000000..c5c46a76011 --- /dev/null +++ b/test/e2e/framework/ingress/BUILD @@ -0,0 +1,42 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["ingress_utils.go"], + importpath = "k8s.io/kubernetes/test/e2e/framework/ingress", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/api/extensions/v1beta1: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", + "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//test/e2e/framework:go_default_library", + "//test/e2e/framework/testfiles:go_default_library", + "//test/e2e/manifest:go_default_library", + "//test/utils:go_default_library", + "//vendor/github.com/golang/glog:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/google.golang.org/api/compute/v1:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/framework/providers/aws/BUILD b/test/e2e/framework/providers/aws/BUILD new file mode 100644 index 00000000000..cbb3587423a --- /dev/null +++ b/test/e2e/framework/providers/aws/BUILD @@ -0,0 +1,32 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["aws.go"], + importpath = "k8s.io/kubernetes/test/e2e/framework/providers/aws", + visibility = ["//visibility:public"], + deps = [ + "//pkg/cloudprovider/providers/aws:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//test/e2e/framework:go_default_library", + "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", + "//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library", + "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", + "//vendor/github.com/aws/aws-sdk-go/service/autoscaling:go_default_library", + "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/framework/providers/azure/BUILD b/test/e2e/framework/providers/azure/BUILD new file mode 100644 index 00000000000..038c7832e9a --- /dev/null +++ b/test/e2e/framework/providers/azure/BUILD @@ -0,0 +1,28 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["azure.go"], + importpath = "k8s.io/kubernetes/test/e2e/framework/providers/azure", + visibility = ["//visibility:public"], + deps = [ + "//pkg/cloudprovider/providers/azure:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", + "//test/e2e/framework:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/framework/providers/gce/BUILD b/test/e2e/framework/providers/gce/BUILD new file mode 100644 index 00000000000..26f978b789b --- /dev/null +++ b/test/e2e/framework/providers/gce/BUILD @@ -0,0 +1,48 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = [ + "firewall.go", + "gce.go", + "ingress.go", + ], + importpath = "k8s.io/kubernetes/test/e2e/framework/providers/gce", + visibility = ["//visibility:public"], + deps = [ + "//pkg/cloudprovider/providers/gce:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/cloud-provider:go_default_library", + "//test/e2e/framework:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/google.golang.org/api/compute/v1:go_default_library", + "//vendor/google.golang.org/api/googleapi:go_default_library", + "//vendor/k8s.io/utils/exec:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = ["firewall_test.go"], + 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 = ["//visibility:public"], +) diff --git a/test/e2e/framework/providers/kubemark/BUILD b/test/e2e/framework/providers/kubemark/BUILD new file mode 100644 index 00000000000..118a61d6fb3 --- /dev/null +++ b/test/e2e/framework/providers/kubemark/BUILD @@ -0,0 +1,30 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["kubemark.go"], + importpath = "k8s.io/kubernetes/test/e2e/framework/providers/kubemark", + visibility = ["//visibility:public"], + deps = [ + "//pkg/kubemark:go_default_library", + "//staging/src/k8s.io/client-go/informers:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", + "//test/e2e/framework:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD index 7e1bd5a4d2d..663a2e5d6e9 100644 --- a/test/e2e/network/BUILD +++ b/test/e2e/network/BUILD @@ -62,6 +62,8 @@ go_library( "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/ingress:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/network/scale:go_default_library", "//test/images/net/nat:go_default_library", "//test/utils:go_default_library", diff --git a/test/e2e/network/scale/BUILD b/test/e2e/network/scale/BUILD index c3bf5f584d4..f99c7d97ade 100644 --- a/test/e2e/network/scale/BUILD +++ b/test/e2e/network/scale/BUILD @@ -12,6 +12,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/ingress:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", ], ) diff --git a/test/e2e/network/scale/localrun/BUILD b/test/e2e/network/scale/localrun/BUILD index 667c5e5ffca..e2bffae8757 100644 --- a/test/e2e/network/scale/localrun/BUILD +++ b/test/e2e/network/scale/localrun/BUILD @@ -12,6 +12,8 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/ingress:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/network/scale:go_default_library", "//vendor/github.com/golang/glog:go_default_library", ], diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 1dcf7f06623..da6de8f703f 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -40,6 +40,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/storage/BUILD b/test/e2e/storage/BUILD index 219917f7ca3..abe4cfdbc43 100644 --- a/test/e2e/storage/BUILD +++ b/test/e2e/storage/BUILD @@ -71,6 +71,7 @@ go_library( "//staging/src/k8s.io/csi-api/pkg/crd:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/metrics:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/manifest:go_default_library", "//test/e2e/storage/drivers:go_default_library", diff --git a/test/e2e/upgrades/BUILD b/test/e2e/upgrades/BUILD index 59f50dd916e..9eca273c31d 100644 --- a/test/e2e/upgrades/BUILD +++ b/test/e2e/upgrades/BUILD @@ -38,6 +38,8 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/ingress:go_default_library", + "//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/scheduling:go_default_library", "//test/utils/image:go_default_library",