github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96399 from andrewsykim/service-config

Browse Source 
move service controller config to k8s.io/cloud-provider/controllers/service/config
This commit is contained in:
Kubernetes Prow Robot 2020-11-12 11:21:57 -08:00 committed by GitHub
commit e38b1b94f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/options/BUILD
View File

@ -132,8 +132,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",

2
cmd/kube-controller-manager/app/options/options_test.go
View File

@ -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"

2
hack/.golint_failures
View File

@ -395,7 +395,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

2
pkg/controller/apis/config/BUILD
View File

@ -37,7 +37,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",
],
)

2
pkg/controller/apis/config/types.go
View File

@ -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"
cronjobconfig "k8s.io/kubernetes/pkg/controller/cronjob/config"

2
pkg/controller/apis/config/v1alpha1/BUILD
View File

@ -41,7 +41,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",
],

2
pkg/controller/apis/config/v1alpha1/defaults.go
View File

@ -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"

2
pkg/controller/apis/config/v1alpha1/doc.go
View File

@ -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

2
pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go generated
View File

@ -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"

1
staging/src/k8s.io/cloud-provider/BUILD
View File

@ -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",
],

2
staging/src/k8s.io/cloud-provider/config/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/cloud-provider/config/types.go
View File

@ -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"
)

2
staging/src/k8s.io/cloud-provider/config/v1alpha1/BUILD
View File

@ -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",
],

2
staging/src/k8s.io/cloud-provider/config/v1alpha1/defaults.go
View File

@ -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"
)

2
staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
View File

@ -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

2
staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go
View File

@ -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"
)

2
staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go generated
View File

@ -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"
)

5
staging/src/k8s.io/cloud-provider/controllers/service/BUILD
View File

@ -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"],
)

6
staging/src/k8s.io/cloud-provider/service/config/BUILD → staging/src/k8s.io/cloud-provider/controllers/service/config/BUILD
View File

@ -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"],

0
staging/src/k8s.io/cloud-provider/service/config/OWNERS → staging/src/k8s.io/cloud-provider/controllers/service/config/OWNERS
View File

2
staging/src/k8s.io/cloud-provider/service/config/doc.go → staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go
View File

@ -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"

0
staging/src/k8s.io/cloud-provider/service/config/types.go → staging/src/k8s.io/cloud-provider/controllers/service/config/types.go
View File

6
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/BUILD → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/conversion.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/conversion.go
View File

@ -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

0
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/defaults.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/defaults.go
View File

6
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/doc.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
View File

@ -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"

0
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/register.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/register.go
View File

0
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/types.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/types.go
View File

2
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.conversion.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.conversion.go generated
View File

@ -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() {

0
staging/src/k8s.io/cloud-provider/service/config/v1alpha1/zz_generated.deepcopy.go → staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/zz_generated.deepcopy.go generated
View File

0
staging/src/k8s.io/cloud-provider/service/config/zz_generated.deepcopy.go → staging/src/k8s.io/cloud-provider/controllers/service/config/zz_generated.deepcopy.go generated
View File

4
staging/src/k8s.io/cloud-provider/options/BUILD
View File

@ -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",

2
staging/src/k8s.io/cloud-provider/options/options_test.go
View File

@ -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"

2
staging/src/k8s.io/cloud-provider/options/servicecontroller.go
View File

@ -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.

2
staging/src/k8s.io/kube-controller-manager/config/v1alpha1/BUILD
View File

@ -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",
],
)

2
staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go
View File

@ -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"
)

4
vendor/modules.txt vendored
View File

@ -2172,11 +2172,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