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

Merge pull request #39490 from deads2k/generic-16-bump-gengo

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39466, 39490, 39527)

bump gengo to latest

bumping gengo to limit surprises while working on https://github.com/kubernetes/kubernetes/pull/39475

@kubernetes/sig-api-machinery-misc
This commit is contained in:
Kubernetes Submit Queue
2017-01-06 11:30:13 -08:00
committed by GitHub
parent 181df90d2f f86447c9a0
commit 07ce35a325
61 changed files with 1296 additions and 3315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/apis/apps/v1beta1/zz_generated.deepcopy.go
View File

@@ -47,7 +47,7 @@ func DeepCopy_v1beta1_StatefulSet(in interface{}, out interface{}, c *conversion
{
in := in.(*StatefulSet)
out := out.(*StatefulSet)
out.TypeMeta = in.TypeMeta
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
return err
}
@@ -65,8 +65,7 @@ func DeepCopy_v1beta1_StatefulSetList(in interface{}, out interface{}, c *conver
{
in := in.(*StatefulSetList)
out := out.(*StatefulSetList)
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
*out = *in
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]StatefulSet, len(*in))
@@ -75,8 +74,6 @@ func DeepCopy_v1beta1_StatefulSetList(in interface{}, out interface{}, c *conver
return err
}
}
} else {
out.Items = nil
}
return nil
}
@@ -86,12 +83,11 @@ func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conver
{
in := in.(*StatefulSetSpec)
out := out.(*StatefulSetSpec)
*out = *in
if in.Replicas != nil {
in, out := &in.Replicas, &out.Replicas
*out = new(int32)
**out = **in
} else {
out.Replicas = nil
}
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
@@ -99,8 +95,6 @@ func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conver
if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err
}
} else {
out.Selector = nil
}
if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
return err
@@ -113,10 +107,7 @@ func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conver
return err
}
}
} else {
out.VolumeClaimTemplates = nil
}
out.ServiceName = in.ServiceName
return nil
}
}
@@ -125,14 +116,12 @@ func DeepCopy_v1beta1_StatefulSetStatus(in interface{}, out interface{}, c *conv
{
in := in.(*StatefulSetStatus)
out := out.(*StatefulSetStatus)
*out = *in
if in.ObservedGeneration != nil {
in, out := &in.ObservedGeneration, &out.ObservedGeneration
*out = new(int64)
**out = **in
} else {
out.ObservedGeneration = nil
}
out.Replicas = in.Replicas
return nil
}
}

18
pkg/apis/apps/zz_generated.deepcopy.go
View File

@@ -47,7 +47,7 @@ func DeepCopy_apps_StatefulSet(in interface{}, out interface{}, c *conversion.Cl
{
in := in.(*StatefulSet)
out := out.(*StatefulSet)
out.TypeMeta = in.TypeMeta
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
return err
}
@@ -65,8 +65,7 @@ func DeepCopy_apps_StatefulSetList(in interface{}, out interface{}, c *conversio
{
in := in.(*StatefulSetList)
out := out.(*StatefulSetList)
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
*out = *in
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]StatefulSet, len(*in))
@@ -75,8 +74,6 @@ func DeepCopy_apps_StatefulSetList(in interface{}, out interface{}, c *conversio
return err
}
}
} else {
out.Items = nil
}
return nil
}
@@ -86,15 +83,13 @@ func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversio
{
in := in.(*StatefulSetSpec)
out := out.(*StatefulSetSpec)
out.Replicas = in.Replicas
*out = *in
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
*out = new(v1.LabelSelector)
if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err
}
} else {
out.Selector = nil
}
if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
return err
@@ -107,10 +102,7 @@ func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversio
return err
}
}
} else {
out.VolumeClaimTemplates = nil
}
out.ServiceName = in.ServiceName
return nil
}
}
@@ -119,14 +111,12 @@ func DeepCopy_apps_StatefulSetStatus(in interface{}, out interface{}, c *convers
{
in := in.(*StatefulSetStatus)
out := out.(*StatefulSetStatus)
*out = *in
if in.ObservedGeneration != nil {
in, out := &in.ObservedGeneration, &out.ObservedGeneration
*out = new(int64)
**out = **in
} else {
out.ObservedGeneration = nil
}
out.Replicas = in.Replicas
return nil
}
}