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

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
5 changed files with 14 additions and 4 deletions

View File

@@ -14604,7 +14604,9 @@
"x-kubernetes-list-map-keys": [
"uid"
],
"x-kubernetes-list-type": "map"
"x-kubernetes-list-type": "map",
"x-kubernetes-patch-merge-key": "uid",
"x-kubernetes-patch-strategy": "merge"
}
},
"type": "object"

View File

@@ -482,7 +482,9 @@
"x-kubernetes-list-map-keys": [
"uid"
],
"x-kubernetes-list-type": "map"
"x-kubernetes-list-type": "map",
"x-kubernetes-patch-merge-key": "uid",
"x-kubernetes-patch-strategy": "merge"
}
},
"type": "object"