github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues 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
commit b37c609b90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/openapi-spec/swagger.json generated
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"

4
api/openapi-spec/v3/apis__resource.k8s.io__v1alpha2_openapi.json
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"

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{

2
staging/src/k8s.io/api/resource/v1alpha2/generated.proto
View File

@ -257,6 +257,8 @@ message ResourceClaimStatus {
//
// +listType=map
// +listMapKey=uid
// +patchStrategy=merge
// +patchMergeKey=uid
// +optional
repeated ResourceClaimConsumerReference reservedFor = 3;

4
staging/src/k8s.io/api/resource/v1alpha2/types.go
View File

@ -114,8 +114,10 @@ type ResourceClaimStatus struct {
//
// +listType=map
// +listMapKey=uid
// +patchStrategy=merge
// +patchMergeKey=uid
// +optional
ReservedFor []ResourceClaimConsumerReference `json:"reservedFor,omitempty" protobuf:"bytes,3,opt,name=reservedFor"`
ReservedFor []ResourceClaimConsumerReference `json:"reservedFor,omitempty" protobuf:"bytes,3,opt,name=reservedFor" patchStrategy:"merge" patchMergeKey:"uid"`
// DeallocationRequested indicates that a ResourceClaim is to be
// deallocated.