github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

remove ReplicationControllerSpec.TemplateRef from v1beta3/types.go and v1/types.go for now

Browse Source
This commit is contained in:
Chao Xu
2015-05-28 16:29:06 -07:00
parent 677d0fdf87
commit 0798ea9ff7
12 changed files with 38 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/api/v1/conversion.go
View File

@@ -193,14 +193,14 @@ func convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *a
} else {
out.Selector = nil
}
if in.TemplateRef != nil {
out.TemplateRef = new(ObjectReference)
if err := convert_api_ObjectReference_To_v1_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil {
return err
}
} else {
out.TemplateRef = nil
}
//if in.TemplateRef != nil {
// out.TemplateRef = new(ObjectReference)
// if err := convert_api_ObjectReference_To_v1_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil {
// return err
// }
//} else {
// out.TemplateRef = nil
//}
if in.Template != nil {
out.Template = new(PodTemplateSpec)
if err := convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in.Template, out.Template, s); err != nil {
@@ -225,14 +225,14 @@ func convert_v1_ReplicationControllerSpec_To_api_ReplicationControllerSpec(in *R
} else {
out.Selector = nil
}
if in.TemplateRef != nil {
out.TemplateRef = new(api.ObjectReference)
if err := convert_v1_ObjectReference_To_api_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil {
return err
}
} else {
out.TemplateRef = nil
}
//if in.TemplateRef != nil {
// out.TemplateRef = new(api.ObjectReference)
// if err := convert_v1_ObjectReference_To_api_ObjectReference(in.TemplateRef, out.TemplateRef, s); err != nil {
// return err
// }
//} else {
// out.TemplateRef = nil
//}
if in.Template != nil {
out.Template = new(api.PodTemplateSpec)
if err := convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil {

8
pkg/api/v1/deep_copy_generated.go
View File

@@ -1518,14 +1518,6 @@ func deepCopy_v1_ReplicationControllerSpec(in ReplicationControllerSpec, out *Re
} else {
out.Selector = nil
}
if in.TemplateRef != nil {
out.TemplateRef = new(ObjectReference)
if err := deepCopy_v1_ObjectReference(*in.TemplateRef, out.TemplateRef, c); err != nil {
return err
}
} else {
out.TemplateRef = nil
}
if in.Template != nil {
out.Template = new(PodTemplateSpec)
if err := deepCopy_v1_PodTemplateSpec(*in.Template, out.Template, c); err != nil {

2
pkg/api/v1/types.go
View File

@@ -962,7 +962,7 @@ type ReplicationControllerSpec struct {
// TemplateRef is a reference to an object that describes the pod that will be created if
// insufficient replicas are detected.
TemplateRef *ObjectReference `json:"templateRef,omitempty" description:"reference to an object that describes the pod that will be created if insufficient replicas are detected"`
//TemplateRef *ObjectReference `json:"templateRef,omitempty" description:"reference to an object that describes the pod that will be created if insufficient replicas are detected"`
// Template is the object that describes the pod that will be created if
// insufficient replicas are detected. This takes precedence over a