github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85651 from deads2k/poststarthook-dupe

Browse Source 
fix kube-apiserver poststarthook additions to avoid duplicating them
This commit is contained in:
Kubernetes Prow Robot 2019-11-26 14:29:33 -08:00 committed by GitHub
commit d044840048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,9 @@ func createAggregatorConfig(
}, },
} }
// we need to clear the poststarthooks so we don't add them multiple times to all the servers (that fails)
aggregatorConfig.GenericConfig.PostStartHooks = map[string]genericapiserver.PostStartHookConfigEntry{}
return aggregatorConfig, nil return aggregatorConfig, nil
} }

3
cmd/kube-apiserver/app/apiextensions.go
View File

@ -92,6 +92,9 @@ func createAPIExtensionsConfig(
}, },
} }
// we need to clear the poststarthooks so we don't add them multiple times to all the servers (that fails)
apiextensionsConfig.GenericConfig.PostStartHooks = map[string]genericapiserver.PostStartHookConfigEntry{}
return apiextensionsConfig, nil return apiextensionsConfig, nil
} }