Skip to content

Commit f5f42df

Browse files
authored
Merge pull request kubernetes#74068 from sttts/sttts-crd-reg-rename
kube-aggregator: fix CRD registration controller name
2 parents 30c7df5 + af17cff commit f5f42df

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmd/kube-apiserver/app/aggregator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega
131131
}
132132
autoRegistrationController := autoregister.NewAutoRegisterController(aggregatorServer.APIRegistrationInformers.Apiregistration().InternalVersion().APIServices(), apiRegistrationClient)
133133
apiServices := apiServicesToRegister(delegateAPIServer, autoRegistrationController)
134-
crdRegistrationController := crdregistration.NewAutoRegistrationController(
134+
crdRegistrationController := crdregistration.NewCRDRegistrationController(
135135
apiExtensionInformers.Apiextensions().InternalVersion().CustomResourceDefinitions(),
136136
autoRegistrationController)
137137

pkg/master/controller/crdregistration/crdregistration_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ type crdRegistrationController struct {
6060
queue workqueue.RateLimitingInterface
6161
}
6262

63-
// NewAutoRegistrationController returns a controller which will register CRD GroupVersions with the auto APIService registration
63+
// NewCRDRegistrationController returns a controller which will register CRD GroupVersions with the auto APIService registration
6464
// controller so they automatically stay in sync.
65-
func NewAutoRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController {
65+
func NewCRDRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController {
6666
c := &crdRegistrationController{
6767
crdLister: crdinformer.Lister(),
6868
crdSynced: crdinformer.Informer().HasSynced,

0 commit comments

Comments
 (0)