scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 02:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122276 from pohly/dra-patch-reserved-for

Browse Source 
dra: enable adding ReservedFor entries through strategic-merge-patch
This commit is contained in:
Kubernetes Prow Robot
2024-01-24 18:46:09 +01:00
committed by GitHub
parent b98e47dd80 324816a883
commit b37c609b90
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -43865,7 +43865,9 @@ func schema_k8sio_api_resource_v1alpha2_ResourceClaimStatus(ref common.Reference
"x-kubernetes-list-map-keys": []interface{}{
"uid",
},
"x-kubernetes-list-type": "map",
"x-kubernetes-list-type": "map",
"x-kubernetes-patch-merge-key": "uid",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{