github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add merge key to initializers.pending

Browse Source
This commit is contained in:
Chao Xu
2017-08-21 23:05:01 -07:00
parent 078a3b653b
commit f2993b810c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
View File

@@ -248,7 +248,9 @@ type Initializers struct {
// When the last pending initializer is removed, and no failing result is set, the initializers // When the last pending initializer is removed, and no failing result is set, the initializers
// struct will be set to nil and the object is considered as initialized and visible to all // struct will be set to nil and the object is considered as initialized and visible to all
// clients. // clients.
Pending []Initializer `json:"pending" protobuf:"bytes,1,rep,name=pending"` // +patchMergeKey=name
// +patchStrategy=merge
Pending []Initializer `json:"pending" protobuf:"bytes,1,rep,name=pending" patchStrategy:"merge" patchMergeKey:"name"`
// If result is set with the Failure field, the object will be persisted to storage and then deleted, // If result is set with the Failure field, the object will be persisted to storage and then deleted,
// ensuring that other clients can observe the deletion. // ensuring that other clients can observe the deletion.
Result *Status `json:"result,omitempty" protobuf:"bytes,2,opt,name=result"` Result *Status `json:"result,omitempty" protobuf:"bytes,2,opt,name=result"`