github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +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
parent 2ca6a87672 b1e0decce1
commit e38b1b94f8
37 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"