Skip to content

K
k3s
Unverified Commit da521d37 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Remove pkg/api* OwnerReference

parent 7700d38e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 44 deletions
pkg/api/types.go
View file @ da521d37
...@@ -163,7 +163,7 @@ type ObjectMeta struct { ...@@ -163,7 +163,7 @@ type ObjectMeta struct {
// then an entry in this list will point to this controller, with the controller field set to true. // 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. // There cannot be more than one managing controller.
// +optional // +optional
OwnerReferences []OwnerReference OwnerReferences []metav1.OwnerReference
// Must be empty before the object is deleted from the registry. Each entry // Must be empty before the object is deleted from the registry. Each entry
// is an identifier for the responsible component that will remove the entry // is an identifier for the responsible component that will remove the entry
...@@ -2551,7 +2551,7 @@ type PreferAvoidPodsEntry struct { ...@@ -2551,7 +2551,7 @@ type PreferAvoidPodsEntry struct {
type PodSignature struct { type PodSignature struct {
// Reference to controller whose pods should avoid this node. // Reference to controller whose pods should avoid this node.
// +optional // +optional
PodController *OwnerReference PodController *metav1.OwnerReference
} }
// Describe a container image // Describe a container image
...@@ -2918,26 +2918,6 @@ type ServiceProxyOptions struct { ...@@ -2918,26 +2918,6 @@ type ServiceProxyOptions struct {
Path string Path string
} }
// OwnerReference contains enough information to let you identify an owning
// object. Currently, an owning object must be in the same namespace, so there
// is no namespace field.
type OwnerReference struct {
// API version of the referent.
APIVersion string
// Kind of the referent.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
Kind string
// Name of the referent.
// More info: http://kubernetes.io/docs/user-guide/identifiers#names
Name string
// UID of the referent.
// More info: http://kubernetes.io/docs/user-guide/identifiers#uids
UID types.UID
// If true, this reference points to the managing controller.
// +optional
Controller *bool
}
// ObjectReference contains enough information to let you inspect or modify the referred object. // ObjectReference contains enough information to let you inspect or modify the referred object.
type ObjectReference struct { type ObjectReference struct {
// +optional // +optional
......
pkg/api/v1/types.go
View file @ da521d37
...@@ -195,7 +195,7 @@ type ObjectMeta struct { ...@@ -195,7 +195,7 @@ type ObjectMeta struct {
// then an entry in this list will point to this controller, with the controller field set to true. // 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. // There cannot be more than one managing controller.
// +optional // +optional
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" patchStrategy:"merge" patchMergeKey:"uid" protobuf:"bytes,13,rep,name=ownerReferences"` OwnerReferences []metav1.OwnerReference `json:"ownerReferences,omitempty" patchStrategy:"merge" patchMergeKey:"uid" protobuf:"bytes,13,rep,name=ownerReferences"`
// Must be empty before the object is deleted from the registry. Each entry // Must be empty before the object is deleted from the registry. Each entry
// is an identifier for the responsible component that will remove the entry // is an identifier for the responsible component that will remove the entry
...@@ -2953,7 +2953,7 @@ type PreferAvoidPodsEntry struct { ...@@ -2953,7 +2953,7 @@ type PreferAvoidPodsEntry struct {
type PodSignature struct { type PodSignature struct {
// Reference to controller whose pods should avoid this node. // Reference to controller whose pods should avoid this node.
// +optional // +optional
PodController *OwnerReference `json:"podController,omitempty" protobuf:"bytes,1,opt,name=podController"` PodController *metav1.OwnerReference `json:"podController,omitempty" protobuf:"bytes,1,opt,name=podController"`
} }
// Describe a container image // Describe a container image
...@@ -3387,26 +3387,6 @@ type ServiceProxyOptions struct { ...@@ -3387,26 +3387,6 @@ type ServiceProxyOptions struct {
Path string `json:"path,omitempty" protobuf:"bytes,1,opt,name=path"` Path string `json:"path,omitempty" protobuf:"bytes,1,opt,name=path"`
} }
// OwnerReference contains enough information to let you identify an owning
// object. Currently, an owning object must be in the same namespace, so there
// is no namespace field.
type OwnerReference struct {
// API version of the referent.
APIVersion string `json:"apiVersion" protobuf:"bytes,5,opt,name=apiVersion"`
// Kind of the referent.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
Kind string `json:"kind" protobuf:"bytes,1,opt,name=kind"`
// Name of the referent.
// More info: http://kubernetes.io/docs/user-guide/identifiers#names
Name string `json:"name" protobuf:"bytes,3,opt,name=name"`
// UID of the referent.
// More info: http://kubernetes.io/docs/user-guide/identifiers#uids
UID types.UID `json:"uid" protobuf:"bytes,4,opt,name=uid,casttype=k8s.io/kubernetes/pkg/types.UID"`
// If true, this reference points to the managing controller.
// +optional
Controller *bool `json:"controller,omitempty" protobuf:"varint,6,opt,name=controller"`
}
// ObjectReference contains enough information to let you inspect or modify the referred object. // ObjectReference contains enough information to let you inspect or modify the referred object.
type ObjectReference struct { type ObjectReference struct {
// Kind of the referent. // Kind of the referent.
......
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