github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move CCM to staging k8s.io/cloud-provider

Browse Source
This commit is contained in:
cici37
2020-10-20 10:28:15 -07:00
parent ad6a2af7d8
commit 9465d95ea6
55 changed files with 387 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,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/app/apis/config: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/controller-manager/config:go_default_library",
],

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

@@ -18,7 +18,7 @@ package config
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
cpconfig "k8s.io/cloud-provider/app/apis/config"
cpconfig "k8s.io/cloud-provider/config"
serviceconfig "k8s.io/cloud-provider/service/config"
cmconfig "k8s.io/controller-manager/config"
csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"

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

@@ -39,7 +39,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/conversion: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/app/apis/config/v1alpha1: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/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/doc.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package
// +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/app/apis/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/controller-manager/config/v1alpha1
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1

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

@@ -24,7 +24,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
apisconfigv1alpha1 "k8s.io/cloud-provider/app/apis/config/v1alpha1"
cloudproviderconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1"
serviceconfigv1alpha1 "k8s.io/cloud-provider/service/config/v1alpha1"
configv1alpha1 "k8s.io/controller-manager/config/v1alpha1"
v1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
@@ -142,7 +142,7 @@ func autoConvert_v1alpha1_KubeControllerManagerConfiguration_To_config_KubeContr
if err := configv1alpha1.Convert_v1alpha1_GenericControllerManagerConfiguration_To_config_GenericControllerManagerConfiguration(&in.Generic, &out.Generic, s); err != nil {
return err
}
if err := apisconfigv1alpha1.Convert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConfiguration(&in.KubeCloudShared, &out.KubeCloudShared, s); err != nil {
if err := cloudproviderconfigv1alpha1.Convert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConfiguration(&in.KubeCloudShared, &out.KubeCloudShared, s); err != nil {
return err
}
if err := attachdetachconfigv1alpha1.Convert_v1alpha1_AttachDetachControllerConfiguration_To_config_AttachDetachControllerConfiguration(&in.AttachDetachController, &out.AttachDetachController, s); err != nil {
@@ -226,7 +226,7 @@ func autoConvert_config_KubeControllerManagerConfiguration_To_v1alpha1_KubeContr
if err := configv1alpha1.Convert_config_GenericControllerManagerConfiguration_To_v1alpha1_GenericControllerManagerConfiguration(&in.Generic, &out.Generic, s); err != nil {
return err
}
if err := apisconfigv1alpha1.Convert_config_KubeCloudSharedConfiguration_To_v1alpha1_KubeCloudSharedConfiguration(&in.KubeCloudShared, &out.KubeCloudShared, s); err != nil {
if err := cloudproviderconfigv1alpha1.Convert_config_KubeCloudSharedConfiguration_To_v1alpha1_KubeCloudSharedConfiguration(&in.KubeCloudShared, &out.KubeCloudShared, s); err != nil {
return err
}
if err := attachdetachconfigv1alpha1.Convert_config_AttachDetachControllerConfiguration_To_v1alpha1_AttachDetachControllerConfiguration(&in.AttachDetachController, &out.AttachDetachController, s); err != nil {

4
pkg/controller/apis/config/v1alpha1/zz_generated.defaults.go generated
View File

@@ -22,7 +22,7 @@ package v1alpha1
import (
runtime "k8s.io/apimachinery/pkg/runtime"
apisconfigv1alpha1 "k8s.io/cloud-provider/app/apis/config/v1alpha1"
cloudproviderconfigv1alpha1 "k8s.io/cloud-provider/config/v1alpha1"
v1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
)
@@ -38,5 +38,5 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
func SetObjectDefaults_KubeControllerManagerConfiguration(in *v1alpha1.KubeControllerManagerConfiguration) {
SetDefaults_KubeControllerManagerConfiguration(in)
apisconfigv1alpha1.SetDefaults_KubeCloudSharedConfiguration(&in.KubeCloudShared)
cloudproviderconfigv1alpha1.SetDefaults_KubeCloudSharedConfiguration(&in.KubeCloudShared)
}