github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

kube-aggregator: fix CRD registration controller name
pull/564/head
Kubernetes Prow Robot 2019-02-14 02:33:02 -08:00 committed by GitHub
parent 30c7df5cd8 af17cff6b0
commit f5f42df42b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/aggregator.go
View File

@ -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)

4
pkg/master/controller/crdregistration/crdregistration_controller.go
View File

@ -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,