scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25567 from gmarek/validate

Browse Source 
Automatic merge from submit-queue

Add Controller field to OwnerReference

cc @davidopp
This commit is contained in:
k8s-merge-robot
2016-05-31 14:21:38 -07:00
parent 430bb9442a 778b1df717
commit 5288a255f4
31 changed files with 503 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/types.go
View File

@@ -140,7 +140,9 @@ type ObjectMeta struct {
Annotations map[string]string `json:"annotations,omitempty"`
// List of objects depended by this object. If ALL objects in the list have
// been deleted, this object will be garbage collected.
// been deleted, this object will be garbage collected. If this object is managed by a controller,
// then an entry in this list will point to this controller, with the controller field set to true.
// There cannot be more than one managing controller.
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"`
// Must be empty before the object is deleted from the registry. Each entry
@@ -2330,6 +2332,8 @@ type OwnerReference struct {
// UID of the referent.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/identifiers.md#uids
UID types.UID `json:"uid"`
// If true, this reference points to the managing controller.
Controller *bool `json:"controller,omitempty"`
}
// ObjectReference contains enough information to let you inspect or modify the referred object.