Move feature gate check to crdInfo construction time

This commit is contained in:
Jordan Liggitt 2020-07-06 14:29:18 -04:00
parent 205d5c5829
commit f03290c390

View File

@ -329,11 +329,9 @@ func (r *crdHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
return
}
if utilfeature.DefaultFeatureGate.Enabled(features.WarningHeaders) {
for _, w := range crdInfo.warnings[requestInfo.APIVersion] {
warning.AddWarning(req.Context(), "", w)
}
}
verb := strings.ToUpper(requestInfo.Verb)
resource := requestInfo.Resource
@ -883,6 +881,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
statusScopes[v.Name] = &statusScope
if v.Deprecated {
if utilfeature.DefaultFeatureGate.Enabled(features.WarningHeaders) {
if v.DeprecationWarning != nil {
warnings[v.Name] = append(warnings[v.Name], *v.DeprecationWarning)
} else {
@ -890,6 +889,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
}
}
}
}
ret := &crdInfo{
spec: &crd.Spec,