Skip to content

K
k3s
Commit 177c0efe authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

Merge pull request #25552 from caesarxuchao/merge-finalizers

add merge tag to v1/ObjectMeta.Finalizers
parents ce803725 6f1521af
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/api/v1/types.go
View file @ 177c0efe
...@@ -184,7 +184,7 @@ type ObjectMeta struct { ...@@ -184,7 +184,7 @@ type ObjectMeta struct {
// is an identifier for the responsible component that will remove the entry // is an identifier for the responsible component that will remove the entry
// from the list. If the deletionTimestamp of the object is non-nil, entries // from the list. If the deletionTimestamp of the object is non-nil, entries
// in this list can only be removed. // in this list can only be removed.
Finalizers []string `json:"finalizers,omitempty" protobuf:"bytes,14,rep,name=finalizers"` Finalizers []string `json:"finalizers,omitempty" patchStrategy:"merge" protobuf:"bytes,14,rep,name=finalizers"`
} }
const ( const (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment