From a226928dc93402dbc172bb55f4bd0c34d124f5a5 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Tue, 4 Sep 2018 17:00:57 +0800 Subject: [PATCH] [kube-controller-manager] fix some reference from pkg/apis/componentconfig about kube-controller-manager api --- pkg/apis/componentconfig/types.go | 9 ++++----- pkg/apis/componentconfig/v1alpha1/defaults.go | 10 ++++------ pkg/apis/componentconfig/v1alpha1/defaults_test.go | 14 +++++++------- pkg/apis/componentconfig/v1alpha1/doc.go | 1 + pkg/apis/componentconfig/v1alpha1/types.go | 9 ++++----- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 8dfc0660209..7da38398556 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -17,9 +17,8 @@ limitations under the License. package componentconfig import ( - apimachineryconfig "k8s.io/apimachinery/pkg/apis/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiserverconfig "k8s.io/apiserver/pkg/apis/config" + kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -28,14 +27,14 @@ type CloudControllerManagerConfiguration struct { metav1.TypeMeta // Generic holds configuration for a generic controller-manager - Generic GenericControllerManagerConfiguration + Generic kubectrlmgrconfig.GenericControllerManagerConfiguration // KubeCloudSharedConfiguration holds configuration for shared related features // both in cloud controller manager and kube-controller manager. - KubeCloudShared KubeCloudSharedConfiguration + KubeCloudShared kubectrlmgrconfig.KubeCloudSharedConfiguration // ServiceControllerConfiguration holds configuration for ServiceController // related features. - ServiceController ServiceControllerConfiguration + ServiceController kubectrlmgrconfig.ServiceControllerConfiguration // NodeStatusUpdateFrequency is the frequency at which the controller updates nodes' status NodeStatusUpdateFrequency metav1.Duration } diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 15476457044..dff62ec4b8c 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -19,11 +19,9 @@ package v1alpha1 import ( "time" - apimachineryconfigv1alpha1 "k8s.io/apimachinery/pkg/apis/config/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" - apiserverconfigv1alpha1 "k8s.io/apiserver/pkg/apis/config/v1alpha1" - utilpointer "k8s.io/utils/pointer" + kubectrlmgrconfigv1alpha1 "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1" ) func addDefaultingFuncs(scheme *kruntime.Scheme) error { @@ -32,9 +30,6 @@ func addDefaultingFuncs(scheme *kruntime.Scheme) error { func SetDefaults_CloudControllerManagerConfiguration(obj *CloudControllerManagerConfiguration) { zero := metav1.Duration{} - if obj.ServiceController.ConcurrentServiceSyncs == 0 { - obj.ServiceController.ConcurrentServiceSyncs = 1 - } if obj.NodeStatusUpdateFrequency == zero { obj.NodeStatusUpdateFrequency = metav1.Duration{Duration: 5 * time.Minute} } @@ -46,4 +41,7 @@ func SetDefaults_CloudControllerManagerConfiguration(obj *CloudControllerManager if obj.Generic.ClientConnection.Burst == 0 { obj.Generic.ClientConnection.Burst = 30 } + + // Use the default RecommendedDefaultGenericControllerManagerConfiguration options + kubectrlmgrconfigv1alpha1.RecommendedDefaultGenericControllerManagerConfiguration(&obj.Generic) } diff --git a/pkg/apis/componentconfig/v1alpha1/defaults_test.go b/pkg/apis/componentconfig/v1alpha1/defaults_test.go index 3e8b897f78e..46d10194dce 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults_test.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults_test.go @@ -24,17 +24,17 @@ import ( componentconfig "k8s.io/kubernetes/pkg/apis/componentconfig" ) -func TestControllerDefaultsRoundTrip(t *testing.T) { - ks1 := &KubeControllerManagerConfiguration{} - SetDefaults_KubeControllerManagerConfiguration(ks1) - cm, err := componentconfig.ConvertObjToConfigMap("KubeControllerManagerConfiguration", ks1) +func TestCloudControllerDefaultsRoundTrip(t *testing.T) { + ks1 := &CloudControllerManagerConfiguration{} + SetDefaults_CloudControllerManagerConfiguration(ks1) + cm, err := componentconfig.ConvertObjToConfigMap("CloudControllerManagerConfiguration", ks1) if err != nil { t.Errorf("unexpected ConvertObjToConfigMap error %v", err) } - ks2 := &KubeControllerManagerConfiguration{} - if err = json.Unmarshal([]byte(cm.Data["KubeControllerManagerConfiguration"]), ks2); err != nil { - t.Errorf("unexpected error unserializing controller manager config %v", err) + ks2 := &CloudControllerManagerConfiguration{} + if err = json.Unmarshal([]byte(cm.Data["CloudControllerManagerConfiguration"]), ks2); err != nil { + t.Errorf("unexpected error unserializing cloud controller manager config %v", err) } if !reflect.DeepEqual(ks2, ks1) { diff --git a/pkg/apis/componentconfig/v1alpha1/doc.go b/pkg/apis/componentconfig/v1alpha1/doc.go index 0cd4bdf9c46..0576c10c2ba 100644 --- a/pkg/apis/componentconfig/v1alpha1/doc.go +++ b/pkg/apis/componentconfig/v1alpha1/doc.go @@ -23,6 +23,7 @@ limitations under the License. // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/componentconfig // +k8s:conversion-gen=k8s.io/apimachinery/pkg/apis/config/v1alpha1 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/config/v1alpha1 +// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1 // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 34ca2839153..027f0143add 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -17,9 +17,8 @@ limitations under the License. package v1alpha1 import ( - apimachineryconfigv1alpha1 "k8s.io/apimachinery/pkg/apis/config/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiserverconfigv1alpha1 "k8s.io/apiserver/pkg/apis/config/v1alpha1" + kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -28,13 +27,13 @@ type CloudControllerManagerConfiguration struct { metav1.TypeMeta `json:",inline"` // Generic holds configuration for a generic controller-manager - Generic GenericControllerManagerConfiguration + Generic kubectrlmgrconfigv1alpha1.GenericControllerManagerConfiguration // KubeCloudSharedConfiguration holds configuration for shared related features // both in cloud controller manager and kube-controller manager. - KubeCloudShared KubeCloudSharedConfiguration + KubeCloudShared kubectrlmgrconfigv1alpha1.KubeCloudSharedConfiguration // ServiceControllerConfiguration holds configuration for ServiceController // related features. - ServiceController ServiceControllerConfiguration + ServiceController kubectrlmgrconfigv1alpha1.ServiceControllerConfiguration // NodeStatusUpdateFrequency is the frequency at which the controller updates nodes' status NodeStatusUpdateFrequency metav1.Duration }