From b1e0decce19563fc6c9aa188105b7c03ab5ee358 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Tue, 10 Nov 2020 01:32:27 -0500 Subject: [PATCH] move service controller config to k8s.io/cloud-provider/controllers/service/config Signed-off-by: Andrew Sy Kim --- cmd/kube-controller-manager/app/options/BUILD | 2 +- cmd/kube-controller-manager/app/options/options_test.go | 2 +- hack/.golint_failures | 2 +- pkg/controller/apis/config/BUILD | 2 +- pkg/controller/apis/config/types.go | 2 +- pkg/controller/apis/config/v1alpha1/BUILD | 2 +- pkg/controller/apis/config/v1alpha1/defaults.go | 2 +- pkg/controller/apis/config/v1alpha1/doc.go | 2 +- .../apis/config/v1alpha1/zz_generated.conversion.go | 2 +- staging/src/k8s.io/cloud-provider/BUILD | 1 - staging/src/k8s.io/cloud-provider/config/BUILD | 2 +- staging/src/k8s.io/cloud-provider/config/types.go | 2 +- staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD | 2 +- .../src/k8s.io/cloud-provider/config/v1alpha1/defaults.go | 2 +- staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go | 2 +- staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go | 2 +- .../config/v1alpha1/zz_generated.conversion.go | 2 +- staging/src/k8s.io/cloud-provider/controllers/service/BUILD | 5 ++++- .../cloud-provider/{ => controllers}/service/config/BUILD | 6 +++--- .../cloud-provider/{ => controllers}/service/config/OWNERS | 0 .../cloud-provider/{ => controllers}/service/config/doc.go | 2 +- .../{ => controllers}/service/config/types.go | 0 .../{ => controllers}/service/config/v1alpha1/BUILD | 6 +++--- .../{ => controllers}/service/config/v1alpha1/conversion.go | 2 +- .../{ => controllers}/service/config/v1alpha1/defaults.go | 0 .../{ => controllers}/service/config/v1alpha1/doc.go | 6 +++--- .../{ => controllers}/service/config/v1alpha1/register.go | 0 .../{ => controllers}/service/config/v1alpha1/types.go | 0 .../service/config/v1alpha1/zz_generated.conversion.go | 2 +- .../service/config/v1alpha1/zz_generated.deepcopy.go | 0 .../service/config/zz_generated.deepcopy.go | 0 staging/src/k8s.io/cloud-provider/options/BUILD | 4 ++-- staging/src/k8s.io/cloud-provider/options/options_test.go | 2 +- .../src/k8s.io/cloud-provider/options/servicecontroller.go | 2 +- .../k8s.io/kube-controller-manager/config/v1alpha1/BUILD | 2 +- .../k8s.io/kube-controller-manager/config/v1alpha1/types.go | 2 +- vendor/modules.txt | 4 ++-- 37 files changed, 40 insertions(+), 38 deletions(-) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/BUILD (75%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/OWNERS (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/doc.go (88%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/types.go (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/BUILD (80%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/conversion.go (96%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/defaults.go (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/doc.go (71%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/register.go (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/types.go (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/zz_generated.conversion.go (97%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/v1alpha1/zz_generated.deepcopy.go (100%) rename staging/src/k8s.io/cloud-provider/{ => controllers}/service/config/zz_generated.deepcopy.go (100%) diff --git a/cmd/kube-controller-manager/app/options/BUILD b/cmd/kube-controller-manager/app/options/BUILD index 4f3de028891..adf7898f219 100644 --- a/cmd/kube-controller-manager/app/options/BUILD +++ b/cmd/kube-controller-manager/app/options/BUILD @@ -129,8 +129,8 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", "//staging/src/k8s.io/cloud-provider/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", "//staging/src/k8s.io/cloud-provider/options:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", "//staging/src/k8s.io/component-base/config:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go index 9ddefbd6cd9..5dbe63162b2 100644 --- a/cmd/kube-controller-manager/app/options/options_test.go +++ b/cmd/kube-controller-manager/app/options/options_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/diff" apiserveroptions "k8s.io/apiserver/pkg/server/options" cpconfig "k8s.io/cloud-provider/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" cpoptions "k8s.io/cloud-provider/options" - serviceconfig "k8s.io/cloud-provider/service/config" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/logs" "k8s.io/component-base/metrics" diff --git a/hack/.golint_failures b/hack/.golint_failures index 85d4af8d0ac..0938bdefa75 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -394,7 +394,7 @@ staging/src/k8s.io/cloud-provider/config/v1alpha1 staging/src/k8s.io/cloud-provider/controllers/node staging/src/k8s.io/cloud-provider/controllers/nodelifecycle staging/src/k8s.io/cloud-provider/controllers/route -staging/src/k8s.io/cloud-provider/service/config/v1alpha1 +staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1 staging/src/k8s.io/code-generator/cmd/client-gen/args staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme diff --git a/pkg/controller/apis/config/BUILD b/pkg/controller/apis/config/BUILD index e8cd0c7f5c1..161c1566a66 100644 --- a/pkg/controller/apis/config/BUILD +++ b/pkg/controller/apis/config/BUILD @@ -36,7 +36,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cloud-provider/config:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", "//staging/src/k8s.io/controller-manager/config:go_default_library", ], ) diff --git a/pkg/controller/apis/config/types.go b/pkg/controller/apis/config/types.go index 62df064dff4..50d90abc4f1 100644 --- a/pkg/controller/apis/config/types.go +++ b/pkg/controller/apis/config/types.go @@ -19,7 +19,7 @@ package config import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" cpconfig "k8s.io/cloud-provider/config" - serviceconfig "k8s.io/cloud-provider/service/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" cmconfig "k8s.io/controller-manager/config" csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config" daemonconfig "k8s.io/kubernetes/pkg/controller/daemon/config" diff --git a/pkg/controller/apis/config/v1alpha1/BUILD b/pkg/controller/apis/config/v1alpha1/BUILD index 68724a6aa6d..aae1c84f350 100644 --- a/pkg/controller/apis/config/v1alpha1/BUILD +++ b/pkg/controller/apis/config/v1alpha1/BUILD @@ -40,7 +40,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cloud-provider/config/v1alpha1:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config/v1alpha1:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1:go_default_library", "//staging/src/k8s.io/controller-manager/config/v1alpha1:go_default_library", "//staging/src/k8s.io/kube-controller-manager/config/v1alpha1:go_default_library", ], diff --git a/pkg/controller/apis/config/v1alpha1/defaults.go b/pkg/controller/apis/config/v1alpha1/defaults.go index 1eb852e73a7..580d6b263de 100644 --- a/pkg/controller/apis/config/v1alpha1/defaults.go +++ b/pkg/controller/apis/config/v1alpha1/defaults.go @@ -18,7 +18,7 @@ package v1alpha1 import ( kruntime "k8s.io/apimachinery/pkg/runtime" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1" kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" csrsigningconfigv1alpha1 "k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1" diff --git a/pkg/controller/apis/config/v1alpha1/doc.go b/pkg/controller/apis/config/v1alpha1/doc.go index 538848728b2..c8a21ae9540 100644 --- a/pkg/controller/apis/config/v1alpha1/doc.go +++ b/pkg/controller/apis/config/v1alpha1/doc.go @@ -18,7 +18,7 @@ limitations under the License. // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config // +k8s:conversion-gen=k8s.io/component-base/config/v1alpha1 // +k8s:conversion-gen=k8s.io/cloud-provider/config/v1alpha1 -// +k8s:conversion-gen=k8s.io/cloud-provider/service/config/v1alpha1 +// +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config/v1alpha1 // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/daemon/config/v1alpha1 diff --git a/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go index 4a8effefa69..f44eb999f55 100644 --- a/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" cloudproviderconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" configv1alpha1 "k8s.io/controller-manager/config/v1alpha1" v1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" config "k8s.io/kubernetes/pkg/controller/apis/config" diff --git a/staging/src/k8s.io/cloud-provider/BUILD b/staging/src/k8s.io/cloud-provider/BUILD index 6c4a0b808ec..7a2fdecb33a 100644 --- a/staging/src/k8s.io/cloud-provider/BUILD +++ b/staging/src/k8s.io/cloud-provider/BUILD @@ -47,7 +47,6 @@ filegroup( "//staging/src/k8s.io/cloud-provider/node:all-srcs", "//staging/src/k8s.io/cloud-provider/options:all-srcs", "//staging/src/k8s.io/cloud-provider/sample:all-srcs", - "//staging/src/k8s.io/cloud-provider/service/config:all-srcs", "//staging/src/k8s.io/cloud-provider/service/helpers:all-srcs", "//staging/src/k8s.io/cloud-provider/volume:all-srcs", ], diff --git a/staging/src/k8s.io/cloud-provider/config/BUILD b/staging/src/k8s.io/cloud-provider/config/BUILD index 5a43abb62e1..6a3797d3a48 100644 --- a/staging/src/k8s.io/cloud-provider/config/BUILD +++ b/staging/src/k8s.io/cloud-provider/config/BUILD @@ -15,7 +15,7 @@ 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/runtime/schema:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", "//staging/src/k8s.io/controller-manager/config:go_default_library", ], ) diff --git a/staging/src/k8s.io/cloud-provider/config/types.go b/staging/src/k8s.io/cloud-provider/config/types.go index 8f06b5d5566..bcb523e9173 100644 --- a/staging/src/k8s.io/cloud-provider/config/types.go +++ b/staging/src/k8s.io/cloud-provider/config/types.go @@ -18,7 +18,7 @@ package config import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - serviceconfig "k8s.io/cloud-provider/service/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" cmconfig "k8s.io/controller-manager/config" ) diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD b/staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD index cf57886c42a..043cb3857ad 100644 --- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD +++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD @@ -21,7 +21,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cloud-provider/config:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config/v1alpha1:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1:go_default_library", "//staging/src/k8s.io/controller-manager/config/v1alpha1:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/defaults.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/defaults.go index 708abf5bee8..a47cf53384e 100644 --- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/defaults.go +++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/defaults.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go index 54f8c38b577..91df9c15b18 100644 --- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go +++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go @@ -23,7 +23,7 @@ limitations under the License. // +k8s:conversion-gen=k8s.io/component-base/config/v1alpha1 // +k8s:conversion-gen=k8s.io/cloud-provider/config // +k8s:conversion-gen=k8s.io/cloud-provider/config/v1alpha1 -// +k8s:conversion-gen=k8s.io/cloud-provider/service/config/v1alpha1 +// +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config/v1alpha1 // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1 // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go index bd3dad70b49..0aed1aa2471 100644 --- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go +++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go @@ -18,7 +18,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1" ) diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go index 85f9c9b65c2..b33ee3e8c5a 100644 --- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" config "k8s.io/cloud-provider/config" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" configv1alpha1 "k8s.io/controller-manager/config/v1alpha1" ) diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/BUILD b/staging/src/k8s.io/cloud-provider/controllers/service/BUILD index 8fbb3835587..ac337f5e8a3 100644 --- a/staging/src/k8s.io/cloud-provider/controllers/service/BUILD +++ b/staging/src/k8s.io/cloud-provider/controllers/service/BUILD @@ -65,7 +65,10 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:all-srcs", + ], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/cloud-provider/service/config/BUILD b/staging/src/k8s.io/cloud-provider/controllers/service/config/BUILD similarity index 75% rename from staging/src/k8s.io/cloud-provider/service/config/BUILD rename to staging/src/k8s.io/cloud-provider/controllers/service/config/BUILD index 8706743420e..99650a452a4 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/BUILD +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/BUILD @@ -7,8 +7,8 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/service/config", - importpath = "k8s.io/cloud-provider/service/config", + importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/controllers/service/config", + importpath = "k8s.io/cloud-provider/controllers/service/config", visibility = ["//visibility:public"], ) @@ -23,7 +23,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/cloud-provider/service/config/v1alpha1:all-srcs", + "//staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/cloud-provider/service/config/OWNERS b/staging/src/k8s.io/cloud-provider/controllers/service/config/OWNERS similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/OWNERS rename to staging/src/k8s.io/cloud-provider/controllers/service/config/OWNERS diff --git a/staging/src/k8s.io/cloud-provider/service/config/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go similarity index 88% rename from staging/src/k8s.io/cloud-provider/service/config/doc.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go index be6c9214369..4c3d3aae1e0 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/doc.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package -package config // import "k8s.io/cloud-provider/service/config" +package config // import "k8s.io/cloud-provider/controllers/service/config" diff --git a/staging/src/k8s.io/cloud-provider/service/config/types.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/types.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/types.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/types.go diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/BUILD b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/BUILD similarity index 80% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/BUILD rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/BUILD index 87566acc1f0..48d420ef55a 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/BUILD +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/BUILD @@ -11,13 +11,13 @@ go_library( "zz_generated.conversion.go", "zz_generated.deepcopy.go", ], - importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/service/config/v1alpha1", - importpath = "k8s.io/cloud-provider/service/config/v1alpha1", + importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/controllers/service/config/v1alpha1", + importpath = "k8s.io/cloud-provider/controllers/service/config/v1alpha1", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", ], ) diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/conversion.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/conversion.go similarity index 96% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/conversion.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/conversion.go index 8faf35b382d..1c9ccc641af 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/conversion.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/conversion.go @@ -18,7 +18,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/conversion" - serviceconfig "k8s.io/cloud-provider/service/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" ) // Important! The public back-and-forth conversion functions for the types in this generic diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/defaults.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/defaults.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/defaults.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/defaults.go diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go similarity index 71% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/doc.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go index ae2205f01b8..3d71af8aff8 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/doc.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go @@ -15,7 +15,7 @@ limitations under the License. */ // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=k8s.io/cloud-provider/service/config -// +k8s:conversion-gen=k8s.io/cloud-provider/service/config/v1alpha1 +// +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config +// +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config/v1alpha1 -package v1alpha1 // import "k8s.io/cloud-provider/service/config/v1alpha1" +package v1alpha1 // import "k8s.io/cloud-provider/controllers/service/config/v1alpha1" diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/register.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/register.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/register.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/register.go diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/types.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/types.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/types.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/types.go diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.conversion.go similarity index 97% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.conversion.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.conversion.go index ddd2910420f..fadd763eb75 100644 --- a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - config "k8s.io/cloud-provider/service/config" + config "k8s.io/cloud-provider/controllers/service/config" ) func init() { diff --git a/staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.deepcopy.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.deepcopy.go diff --git a/staging/src/k8s.io/cloud-provider/service/config/zz_generated.deepcopy.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/zz_generated.deepcopy.go similarity index 100% rename from staging/src/k8s.io/cloud-provider/service/config/zz_generated.deepcopy.go rename to staging/src/k8s.io/cloud-provider/controllers/service/config/zz_generated.deepcopy.go diff --git a/staging/src/k8s.io/cloud-provider/options/BUILD b/staging/src/k8s.io/cloud-provider/options/BUILD index 5438d1fffa6..90d21148482 100644 --- a/staging/src/k8s.io/cloud-provider/options/BUILD +++ b/staging/src/k8s.io/cloud-provider/options/BUILD @@ -29,7 +29,7 @@ go_library( "//staging/src/k8s.io/cloud-provider/config:go_default_library", "//staging/src/k8s.io/cloud-provider/config/install:go_default_library", "//staging/src/k8s.io/cloud-provider/config/v1alpha1:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/controller-manager/options:go_default_library", "//staging/src/k8s.io/controller-manager/pkg/clientbuilder:go_default_library", @@ -61,7 +61,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", "//staging/src/k8s.io/cloud-provider/config:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config:go_default_library", "//staging/src/k8s.io/component-base/config:go_default_library", "//staging/src/k8s.io/controller-manager/config:go_default_library", "//staging/src/k8s.io/controller-manager/options:go_default_library", diff --git a/staging/src/k8s.io/cloud-provider/options/options_test.go b/staging/src/k8s.io/cloud-provider/options/options_test.go index 38e2a3e5e4b..2ea25bdcb33 100644 --- a/staging/src/k8s.io/cloud-provider/options/options_test.go +++ b/staging/src/k8s.io/cloud-provider/options/options_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" apiserveroptions "k8s.io/apiserver/pkg/server/options" cpconfig "k8s.io/cloud-provider/config" - serviceconfig "k8s.io/cloud-provider/service/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" componentbaseconfig "k8s.io/component-base/config" cmconfig "k8s.io/controller-manager/config" cmoptions "k8s.io/controller-manager/options" diff --git a/staging/src/k8s.io/cloud-provider/options/servicecontroller.go b/staging/src/k8s.io/cloud-provider/options/servicecontroller.go index 6441642a5ac..c63e43a9805 100644 --- a/staging/src/k8s.io/cloud-provider/options/servicecontroller.go +++ b/staging/src/k8s.io/cloud-provider/options/servicecontroller.go @@ -18,7 +18,7 @@ package options import ( "github.com/spf13/pflag" - serviceconfig "k8s.io/cloud-provider/service/config" + serviceconfig "k8s.io/cloud-provider/controllers/service/config" ) // ServiceControllerOptions holds the ServiceController options. diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD index b0005ca2db9..73724c9b656 100644 --- a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD +++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD @@ -16,7 +16,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cloud-provider/config/v1alpha1:go_default_library", - "//staging/src/k8s.io/cloud-provider/service/config/v1alpha1:go_default_library", + "//staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1:go_default_library", "//staging/src/k8s.io/controller-manager/config/v1alpha1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go index ce3c2dbe030..00d297fb75f 100644 --- a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" cpconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1" - serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1" + serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1" cmconfigv1alpha1 "k8s.io/controller-manager/config/v1alpha1" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index c596c25ba89..30fe242f122 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2167,11 +2167,11 @@ k8s.io/cloud-provider/controllers/node k8s.io/cloud-provider/controllers/nodelifecycle k8s.io/cloud-provider/controllers/route k8s.io/cloud-provider/controllers/service +k8s.io/cloud-provider/controllers/service/config +k8s.io/cloud-provider/controllers/service/config/v1alpha1 k8s.io/cloud-provider/fake k8s.io/cloud-provider/node/helpers k8s.io/cloud-provider/options -k8s.io/cloud-provider/service/config -k8s.io/cloud-provider/service/config/v1alpha1 k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors