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

move tracing instantiation further up, and check for nil

Browse Source
This commit is contained in:
David Ashpole 2021-07-01 10:42:11 -07:00
parent 79d400c441
commit b0ffaa93f5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
staging/src/k8s.io/apiserver/pkg/server/options/recommended.go
View File

@ -104,6 +104,14 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig) error {
if err := o.Etcd.ApplyTo(&config.Config); err != nil { if err := o.Etcd.ApplyTo(&config.Config); err != nil {
return err return err
} }
if err := o.EgressSelector.ApplyTo(&config.Config); err != nil {
return err
}
if feature.DefaultFeatureGate.Enabled(features.APIServerTracing) {
if err := o.Traces.ApplyTo(config.Config.EgressSelector, &config.Config); err != nil {
return err
}
}
if err := o.SecureServing.ApplyTo(&config.Config.SecureServing, &config.Config.LoopbackClientConfig); err != nil { if err := o.SecureServing.ApplyTo(&config.Config.SecureServing, &config.Config.LoopbackClientConfig); err != nil {
return err return err
} }
@ -119,14 +127,6 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig) error {
if err := o.Features.ApplyTo(&config.Config); err != nil { if err := o.Features.ApplyTo(&config.Config); err != nil {
return err return err
} }
if err := o.EgressSelector.ApplyTo(&config.Config); err != nil {
return err
}
if feature.DefaultFeatureGate.Enabled(features.APIServerTracing) {
if err := o.Traces.ApplyTo(config.Config.EgressSelector, &config.Config); err != nil {
return err
}
}
if err := o.CoreAPI.ApplyTo(config); err != nil { if err := o.CoreAPI.ApplyTo(config); err != nil {
return err return err
} }

4
staging/src/k8s.io/apiserver/pkg/server/options/tracing.go
View File

@ -106,7 +106,9 @@ func (o *TracingOptions) ApplyTo(es *egressselector.EgressSelector, c *server.Co
} }
tp := traces.NewProvider(context.Background(), sampler, resourceOpts, opts...) tp := traces.NewProvider(context.Background(), sampler, resourceOpts, opts...)
c.TracerProvider = &tp c.TracerProvider = &tp
c.LoopbackClientConfig.Wrap(traces.WrapperFor(c.TracerProvider)) if c.LoopbackClientConfig != nil {
c.LoopbackClientConfig.Wrap(traces.WrapperFor(c.TracerProvider))
}
return nil return nil
} }