Skip to content

Commit 7e88a33

Browse files
authored
Merge pull request kubernetes#120396 from wangwei10061/master
Fix wrong annotations in defaults.go
2 parents 9c4181e + 3900d7c commit 7e88a33

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/controller/apis/config/v1alpha1/defaults.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func SetDefaults_KubeControllerManagerConfiguration(obj *kubectrlmgrconfigv1alph
8181
endpointslicemirroringconfigv1alpha1.RecommendedDefaultEndpointSliceMirroringControllerConfiguration(&obj.EndpointSliceMirroringController)
8282
// Use the default RecommendedDefaultEphemeralVolumeControllerConfiguration options
8383
ephemeralvolumeconfigv1alpha1.RecommendedDefaultEphemeralVolumeControllerConfiguration(&obj.EphemeralVolumeController)
84-
// Use the default RecommendedDefaultGenericControllerManagerConfiguration options
84+
// Use the default RecommendedDefaultGarbageCollectorControllerConfiguration options
8585
garbagecollectorconfigv1alpha1.RecommendedDefaultGarbageCollectorControllerConfiguration(&obj.GarbageCollectorController)
8686
// Use the default RecommendedDefaultJobControllerConfiguration options
8787
jobconfigv1alpha1.RecommendedDefaultJobControllerConfiguration(&obj.JobController)
@@ -103,7 +103,7 @@ func SetDefaults_KubeControllerManagerConfiguration(obj *kubectrlmgrconfigv1alph
103103
replicationconfigv1alpha1.RecommendedDefaultReplicationControllerConfiguration(&obj.ReplicationController)
104104
// Use the default RecommendedDefaultResourceQuotaControllerConfiguration options
105105
resourcequotaconfigv1alpha1.RecommendedDefaultResourceQuotaControllerConfiguration(&obj.ResourceQuotaController)
106-
// Use the default RecommendedDefaultGenericControllerManagerConfiguration options
106+
// Use the default RecommendedDefaultServiceControllerConfiguration options
107107
serviceconfigv1alpha1.RecommendedDefaultServiceControllerConfiguration(&obj.ServiceController)
108108
// Use the default RecommendedDefaultLegacySATokenCleanerConfiguration options
109109
serviceaccountconfigv1alpha1.RecommendedDefaultLegacySATokenCleanerConfiguration(&obj.LegacySATokenCleaner)

0 commit comments

Comments
 (0)