scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129434 from xigang/crd_handler

Browse Source 
refactor: simplify boolean expressions in CRD handler
This commit is contained in:
Kubernetes Prow Robot
2025-01-07 17:12:30 -08:00
committed by GitHub
parent 0e78cf18d1 deb234c9d5
commit 14dafc30c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
View File

@@ -660,13 +660,13 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
return nil, fmt.Errorf("failed converting CRD validation to internal version: %v", err) return nil, fmt.Errorf("failed converting CRD validation to internal version: %v", err)
} }
s, err := structuralschema.NewStructural(internalValidation.OpenAPIV3Schema) s, err := structuralschema.NewStructural(internalValidation.OpenAPIV3Schema)
if crd.Spec.PreserveUnknownFields == false && err != nil { if !crd.Spec.PreserveUnknownFields && err != nil {
// This should never happen. If it does, it is a programming error. // This should never happen. If it does, it is a programming error.
utilruntime.HandleError(fmt.Errorf("failed to convert schema to structural: %v", err)) utilruntime.HandleError(fmt.Errorf("failed to convert schema to structural: %v", err))
return nil, fmt.Errorf("the server could not properly serve the CR schema") // validation should avoid this return nil, fmt.Errorf("the server could not properly serve the CR schema") // validation should avoid this
} }
if crd.Spec.PreserveUnknownFields == false { if !crd.Spec.PreserveUnknownFields {
// we don't own s completely, e.g. defaults are not deep-copied. So better make a copy here. // we don't own s completely, e.g. defaults are not deep-copied. So better make a copy here.
s = s.DeepCopy() s = s.DeepCopy()