diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults.go index 74942c6d4c87..3be15b61a75b 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults.go @@ -29,7 +29,8 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { return RegisterDefaults(scheme) } -func SetDefaults_CloudControllerManagerConfiguration(obj *CloudControllerManagerConfiguration) { +// SetDefaultsCloudControllerManagerConfiguration use default CloudControllerManagerConfiguration options +func SetDefaultsCloudControllerManagerConfiguration(obj *CloudControllerManagerConfiguration) { zero := metav1.Duration{} if obj.NodeStatusUpdateFrequency == zero { obj.NodeStatusUpdateFrequency = metav1.Duration{Duration: 5 * time.Minute} diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults_test.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults_test.go index f3dffd053a39..fc086cfc0171 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults_test.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults_test.go @@ -28,7 +28,7 @@ import ( func TestCloudControllerManagerDefaultsRoundTrip(t *testing.T) { ks1 := &CloudControllerManagerConfiguration{} - SetDefaults_CloudControllerManagerConfiguration(ks1) + SetDefaultsCloudControllerManagerConfiguration(ks1) cm, err := convertObjToConfigMap("CloudControllerManagerConfiguration", ks1) if err != nil { t.Errorf("unexpected ConvertObjToConfigMap error %v", err) diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/register.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/register.go index 94320d37c78d..5522496182e1 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/register.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/register.go @@ -25,7 +25,7 @@ import ( const GroupName = "cloudcontrollermanager.config.k8s.io" var ( - // GroupName is the group name use in this package + // SchemeGroupVersion is the group name use in this package SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} // SchemeBuilder is the scheme builder with scheme init functions to run for this API package SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/types.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/types.go index d4e8cad4a41d..4904dc0fec7f 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/types.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/types.go @@ -23,6 +23,7 @@ import ( // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// CloudControllerManagerConfiguration holds configuration for CloudControllerManager type CloudControllerManagerConfiguration struct { metav1.TypeMeta `json:",inline"` diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/zz_generated.defaults.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/zz_generated.defaults.go index 57e1a22b1014..5486e77f7045 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/zz_generated.defaults.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/zz_generated.defaults.go @@ -36,6 +36,5 @@ func RegisterDefaults(scheme *runtime.Scheme) error { } func SetObjectDefaults_CloudControllerManagerConfiguration(in *CloudControllerManagerConfiguration) { - SetDefaults_CloudControllerManagerConfiguration(in) configv1alpha1.SetDefaults_KubeCloudSharedConfiguration(&in.KubeCloudShared) } diff --git a/hack/.golint_failures b/hack/.golint_failures index 271b6b398df0..1336eff3214c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -1,5 +1,4 @@ # Apart from this line, only trailing comments are supported -cmd/cloud-controller-manager/app/apis/config/v1alpha1 cmd/kube-apiserver/app cmd/kubeadm/app/apis/kubeadm/v1beta1 cmd/kubeadm/app/apis/kubeadm/v1beta2