Skip to content

Commit 2e857c1

Browse files
Merge pull request #115400 from pohly/automated-cherry-pick-of-#115354-origin-release-1.26
Automated cherry pick of #115354: dynamic resource allocation: avoid apiserver complaint about Kubernetes-commit: 41137e4de44ad12b86152359abc46414692906d1
2 parents 1c6bd70 + 50d0b42 commit 2e857c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: resource/v1alpha1/generated.proto

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: resource/v1alpha1/types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ type ResourceClaimStatus struct {
112112
// There can be at most 32 such reservations. This may get increased in
113113
// the future, but not reduced.
114114
//
115-
// +listType=set
115+
// +listType=map
116+
// +listMapKey=uid
116117
// +optional
117118
ReservedFor []ResourceClaimConsumerReference `json:"reservedFor,omitempty" protobuf:"bytes,3,opt,name=reservedFor"`
118119

0 commit comments

Comments
 (0)