Unverified Commit f5f42df4 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #74068 from sttts/sttts-crd-reg-rename

kube-aggregator: fix CRD registration controller name
parents 30c7df5c af17cff6
...@@ -131,7 +131,7 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega ...@@ -131,7 +131,7 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega
} }
autoRegistrationController := autoregister.NewAutoRegisterController(aggregatorServer.APIRegistrationInformers.Apiregistration().InternalVersion().APIServices(), apiRegistrationClient) autoRegistrationController := autoregister.NewAutoRegisterController(aggregatorServer.APIRegistrationInformers.Apiregistration().InternalVersion().APIServices(), apiRegistrationClient)
apiServices := apiServicesToRegister(delegateAPIServer, autoRegistrationController) apiServices := apiServicesToRegister(delegateAPIServer, autoRegistrationController)
crdRegistrationController := crdregistration.NewAutoRegistrationController( crdRegistrationController := crdregistration.NewCRDRegistrationController(
apiExtensionInformers.Apiextensions().InternalVersion().CustomResourceDefinitions(), apiExtensionInformers.Apiextensions().InternalVersion().CustomResourceDefinitions(),
autoRegistrationController) autoRegistrationController)
......
...@@ -60,9 +60,9 @@ type crdRegistrationController struct { ...@@ -60,9 +60,9 @@ type crdRegistrationController struct {
queue workqueue.RateLimitingInterface queue workqueue.RateLimitingInterface
} }
// NewAutoRegistrationController returns a controller which will register CRD GroupVersions with the auto APIService registration // NewCRDRegistrationController returns a controller which will register CRD GroupVersions with the auto APIService registration
// controller so they automatically stay in sync. // controller so they automatically stay in sync.
func NewAutoRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController { func NewCRDRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController {
c := &crdRegistrationController{ c := &crdRegistrationController{
crdLister: crdinformer.Lister(), crdLister: crdinformer.Lister(),
crdSynced: crdinformer.Informer().HasSynced, crdSynced: crdinformer.Informer().HasSynced,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment