Skip to content

Commit

Permalink
Merge pull request #115400 from pohly/automated-cherry-pick-of-#11535…
Browse files Browse the repository at this point in the history
…4-origin-release-1.26

Automated cherry pick of #115354: dynamic resource allocation: avoid apiserver complaint about

Kubernetes-commit: 41137e4de44ad12b86152359abc46414692906d1
  • Loading branch information
k8s-publishing-bot committed Feb 10, 2023
2 parents 1c6bd70 + 50d0b42 commit 2e857c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion resource/v1alpha1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion resource/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ type ResourceClaimStatus struct {
// There can be at most 32 such reservations. This may get increased in
// the future, but not reduced.
//
// +listType=set
// +listType=map
// +listMapKey=uid
// +optional
ReservedFor []ResourceClaimConsumerReference `json:"reservedFor,omitempty" protobuf:"bytes,3,opt,name=reservedFor"`

Expand Down

0 comments on commit 2e857c1

Please sign in to comment.