From d06cd7ee4f58d959a442121d1dde204261178db9 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Sat, 9 May 2020 20:21:57 -0400 Subject: [PATCH] move pkg/controller/service to k8s.io/cloud-provider/controllers/service for easier external consumption Signed-off-by: Andrew Sy Kim --- cmd/cloud-controller-manager/app/BUILD | 2 +- cmd/cloud-controller-manager/app/core.go | 2 +- cmd/kube-controller-manager/app/BUILD | 2 +- cmd/kube-controller-manager/app/core.go | 2 +- pkg/controller/BUILD | 2 +- staging/src/k8s.io/cloud-provider/BUILD | 1 + .../src/k8s.io/cloud-provider/controllers}/service/BUILD | 8 +++----- .../src/k8s.io/cloud-provider/controllers}/service/OWNERS | 0 .../cloud-provider/controllers}/service/controller.go | 0 .../controllers}/service/controller_test.go | 0 .../src/k8s.io/cloud-provider/controllers}/service/doc.go | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) rename {pkg/controller => staging/src/k8s.io/cloud-provider/controllers}/service/BUILD (94%) rename {pkg/controller => staging/src/k8s.io/cloud-provider/controllers}/service/OWNERS (100%) rename {pkg/controller => staging/src/k8s.io/cloud-provider/controllers}/service/controller.go (100%) rename {pkg/controller => staging/src/k8s.io/cloud-provider/controllers}/service/controller_test.go (100%) rename {pkg/controller => staging/src/k8s.io/cloud-provider/controllers}/service/doc.go (90%) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 7a12ef11344..d50c8cf8d4e 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -14,7 +14,6 @@ go_library( "//cmd/controller-manager/app:go_default_library", "//pkg/controller/cloud:go_default_library", "//pkg/controller/route:go_default_library", - "//pkg/controller/service: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", @@ -24,6 +23,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/leaderelection:go_default_library", "//staging/src/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/configz:go_default_library", diff --git a/cmd/cloud-controller-manager/app/core.go b/cmd/cloud-controller-manager/app/core.go index c73a289e9b7..76bbe502171 100644 --- a/cmd/cloud-controller-manager/app/core.go +++ b/cmd/cloud-controller-manager/app/core.go @@ -27,11 +27,11 @@ import ( "strings" cloudprovider "k8s.io/cloud-provider" + servicecontroller "k8s.io/cloud-provider/controllers/service" "k8s.io/klog/v2" cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud" routecontroller "k8s.io/kubernetes/pkg/controller/route" - servicecontroller "k8s.io/kubernetes/pkg/controller/service" netutils "k8s.io/utils/net" utilfeature "k8s.io/apiserver/pkg/util/feature" diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index 892495b1a5a..5c7647a0970 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -71,7 +71,6 @@ go_library( "//pkg/controller/replication:go_default_library", "//pkg/controller/resourcequota:go_default_library", "//pkg/controller/route:go_default_library", - "//pkg/controller/service:go_default_library", "//pkg/controller/serviceaccount:go_default_library", "//pkg/controller/statefulset:go_default_library", "//pkg/controller/ttl:go_default_library", @@ -137,6 +136,7 @@ go_library( "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", "//staging/src/k8s.io/client-go/util/keyutil:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/configz:go_default_library", diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 76c2c0c4210..de2752951ec 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -38,6 +38,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/metadata" restclient "k8s.io/client-go/rest" + servicecontroller "k8s.io/cloud-provider/controllers/service" "k8s.io/component-base/metrics/prometheus/ratelimiter" csitrans "k8s.io/csi-translation-lib" "k8s.io/kubernetes/pkg/controller" @@ -53,7 +54,6 @@ import ( replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" routecontroller "k8s.io/kubernetes/pkg/controller/route" - servicecontroller "k8s.io/kubernetes/pkg/controller/service" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" ttlcontroller "k8s.io/kubernetes/pkg/controller/ttl" "k8s.io/kubernetes/pkg/controller/ttlafterfinished" diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index c1261c2e379..1e79aa2dbec 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -133,7 +133,7 @@ filegroup( "//pkg/controller/replication:all-srcs", "//pkg/controller/resourcequota:all-srcs", "//pkg/controller/route:all-srcs", - "//pkg/controller/service:all-srcs", + "//pkg/controller/service/config:all-srcs", "//pkg/controller/serviceaccount:all-srcs", "//pkg/controller/statefulset:all-srcs", "//pkg/controller/testutil:all-srcs", diff --git a/staging/src/k8s.io/cloud-provider/BUILD b/staging/src/k8s.io/cloud-provider/BUILD index 0a7a917ccf3..8264359b262 100644 --- a/staging/src/k8s.io/cloud-provider/BUILD +++ b/staging/src/k8s.io/cloud-provider/BUILD @@ -37,6 +37,7 @@ filegroup( srcs = [ ":package-srcs", "//staging/src/k8s.io/cloud-provider/api:all-srcs", + "//staging/src/k8s.io/cloud-provider/controllers/service:all-srcs", "//staging/src/k8s.io/cloud-provider/fake:all-srcs", "//staging/src/k8s.io/cloud-provider/node:all-srcs", "//staging/src/k8s.io/cloud-provider/service/helpers:all-srcs", diff --git a/pkg/controller/service/BUILD b/staging/src/k8s.io/cloud-provider/controllers/service/BUILD similarity index 94% rename from pkg/controller/service/BUILD rename to staging/src/k8s.io/cloud-provider/controllers/service/BUILD index d2812ccffd5..6ae35ceb0a8 100644 --- a/pkg/controller/service/BUILD +++ b/staging/src/k8s.io/cloud-provider/controllers/service/BUILD @@ -6,7 +6,8 @@ go_library( "controller.go", "doc.go", ], - importpath = "k8s.io/kubernetes/pkg/controller/service", + importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/controllers/service", + importpath = "k8s.io/cloud-provider/controllers/service", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -65,10 +66,7 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/controller/service/config:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/pkg/controller/service/OWNERS b/staging/src/k8s.io/cloud-provider/controllers/service/OWNERS similarity index 100% rename from pkg/controller/service/OWNERS rename to staging/src/k8s.io/cloud-provider/controllers/service/OWNERS diff --git a/pkg/controller/service/controller.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller.go similarity index 100% rename from pkg/controller/service/controller.go rename to staging/src/k8s.io/cloud-provider/controllers/service/controller.go diff --git a/pkg/controller/service/controller_test.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go similarity index 100% rename from pkg/controller/service/controller_test.go rename to staging/src/k8s.io/cloud-provider/controllers/service/controller_test.go diff --git a/pkg/controller/service/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/doc.go similarity index 90% rename from pkg/controller/service/doc.go rename to staging/src/k8s.io/cloud-provider/controllers/service/doc.go index 1c4e0558d78..252a23e5026 100644 --- a/pkg/controller/service/doc.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package service contains code for syncing cloud load balancers // with the service registry. -package service // import "k8s.io/kubernetes/pkg/controller/service" +package service // import "k8s.io/cloud-provider/controllers/service"