mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Stop clearing OpenAPIConfig for kube-aggregator
This commit is contained in:
parent
dab5112240
commit
d33c12bb69
@ -163,11 +163,6 @@ func (cfg *Config) Complete() CompletedConfig {
|
||||
|
||||
// NewWithDelegate returns a new instance of APIAggregator from the given config.
|
||||
func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.DelegationTarget) (*APIAggregator, error) {
|
||||
// Prevent generic API server to install OpenAPI handler. Aggregator server
|
||||
// has its own customized OpenAPI handler.
|
||||
openAPIConfig := c.GenericConfig.OpenAPIConfig
|
||||
c.GenericConfig.OpenAPIConfig = nil
|
||||
|
||||
genericServer, err := c.GenericConfig.New("kube-aggregator", delegationTarget)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -191,7 +186,7 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
|
||||
lister: informerFactory.Apiregistration().V1().APIServices().Lister(),
|
||||
APIRegistrationInformers: informerFactory,
|
||||
serviceResolver: c.ExtraConfig.ServiceResolver,
|
||||
openAPIConfig: openAPIConfig,
|
||||
openAPIConfig: c.GenericConfig.OpenAPIConfig,
|
||||
egressSelector: c.GenericConfig.EgressSelector,
|
||||
proxyCurrentCertKeyContent: func() (bytes []byte, bytes2 []byte) { return nil, nil },
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user