github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues 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

1
federation/apis/federation/v1beta1/BUILD
View File

@@ -20,6 +20,7 @@ go_library(
"types_swagger_doc_generated.go",
"zz_generated.conversion.go",
"zz_generated.deepcopy.go",
"zz_generated.defaults.go",
],
tags = ["automanaged"],
deps = [

26
federation/apis/federation/v1beta1/zz_generated.deepcopy.go
View File

@@ -48,7 +48,7 @@ func DeepCopy_v1beta1_Cluster(in interface{}, out interface{}, c *conversion.Clo
{
in := in.(*Cluster)
out := out.(*Cluster)
out.TypeMeta = in.TypeMeta
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
return err
}
@@ -66,12 +66,9 @@ func DeepCopy_v1beta1_ClusterCondition(in interface{}, out interface{}, c *conve
{
in := in.(*ClusterCondition)
out := out.(*ClusterCondition)
out.Type = in.Type
out.Status = in.Status
*out = *in
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
return nil
}
}
@@ -80,8 +77,7 @@ func DeepCopy_v1beta1_ClusterList(in interface{}, out interface{}, c *conversion
{
in := in.(*ClusterList)
out := out.(*ClusterList)
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
*out = *in
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Cluster, len(*in))
@@ -90,8 +86,6 @@ func DeepCopy_v1beta1_ClusterList(in interface{}, out interface{}, c *conversion
return err
}
}
} else {
out.Items = nil
}
return nil
}
@@ -101,21 +95,18 @@ func DeepCopy_v1beta1_ClusterSpec(in interface{}, out interface{}, c *conversion
{
in := in.(*ClusterSpec)
out := out.(*ClusterSpec)
*out = *in
if in.ServerAddressByClientCIDRs != nil {
in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
*out = make([]ServerAddressByClientCIDR, len(*in))
for i := range *in {
(*out)[i] = (*in)[i]
}
} else {
out.ServerAddressByClientCIDRs = nil
}
if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(v1.LocalObjectReference)
**out = **in
} else {
out.SecretRef = nil
}
return nil
}
@@ -125,6 +116,7 @@ func DeepCopy_v1beta1_ClusterStatus(in interface{}, out interface{}, c *conversi
{
in := in.(*ClusterStatus)
out := out.(*ClusterStatus)
*out = *in
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]ClusterCondition, len(*in))
@@ -133,17 +125,12 @@ func DeepCopy_v1beta1_ClusterStatus(in interface{}, out interface{}, c *conversi
return err
}
}
} else {
out.Conditions = nil
}
if in.Zones != nil {
in, out := &in.Zones, &out.Zones
*out = make([]string, len(*in))
copy(*out, *in)
} else {
out.Zones = nil
}
out.Region = in.Region
return nil
}
}
@@ -152,8 +139,7 @@ func DeepCopy_v1beta1_ServerAddressByClientCIDR(in interface{}, out interface{},
{
in := in.(*ServerAddressByClientCIDR)
out := out.(*ServerAddressByClientCIDR)
out.ClientCIDR = in.ClientCIDR
out.ServerAddress = in.ServerAddress
*out = *in
return nil
}
}

32
federation/apis/federation/v1beta1/zz_generated.defaults.go Normal file
View File

@@ -0,0 +1,32 @@
// +build !ignore_autogenerated
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// This file was autogenerated by defaulter-gen. Do not edit it manually!
package v1beta1
import (
runtime "k8s.io/kubernetes/pkg/runtime"
)
// RegisterDefaults adds defaulters functions to the given scheme.
// Public to allow building arbitrary schemes.
// All generated defaulters are covering - they call all nested defaulters.
func RegisterDefaults(scheme *runtime.Scheme) error {
return nil
}

35
federation/apis/federation/zz_generated.deepcopy.go
View File

@@ -50,7 +50,7 @@ func DeepCopy_federation_Cluster(in interface{}, out interface{}, c *conversion.
{
in := in.(*Cluster)
out := out.(*Cluster)
out.TypeMeta = in.TypeMeta
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
return err
}
@@ -68,12 +68,9 @@ func DeepCopy_federation_ClusterCondition(in interface{}, out interface{}, c *co
{
in := in.(*ClusterCondition)
out := out.(*ClusterCondition)
out.Type = in.Type
out.Status = in.Status
*out = *in
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
return nil
}
}
@@ -82,8 +79,7 @@ func DeepCopy_federation_ClusterList(in interface{}, out interface{}, c *convers
{
in := in.(*ClusterList)
out := out.(*ClusterList)
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
*out = *in
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Cluster, len(*in))
@@ -92,8 +88,6 @@ func DeepCopy_federation_ClusterList(in interface{}, out interface{}, c *convers
return err
}
}
} else {
out.Items = nil
}
return nil
}
@@ -103,15 +97,12 @@ func DeepCopy_federation_ClusterReplicaSetPreferences(in interface{}, out interf
{
in := in.(*ClusterReplicaSetPreferences)
out := out.(*ClusterReplicaSetPreferences)
out.MinReplicas = in.MinReplicas
*out = *in
if in.MaxReplicas != nil {
in, out := &in.MaxReplicas, &out.MaxReplicas
*out = new(int64)
**out = **in
} else {
out.MaxReplicas = nil
}
out.Weight = in.Weight
return nil
}
}
@@ -120,21 +111,18 @@ func DeepCopy_federation_ClusterSpec(in interface{}, out interface{}, c *convers
{
in := in.(*ClusterSpec)
out := out.(*ClusterSpec)
*out = *in
if in.ServerAddressByClientCIDRs != nil {
in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs
*out = make([]ServerAddressByClientCIDR, len(*in))
for i := range *in {
(*out)[i] = (*in)[i]
}
} else {
out.ServerAddressByClientCIDRs = nil
}
if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(api.LocalObjectReference)
**out = **in
} else {
out.SecretRef = nil
}
return nil
}
@@ -144,6 +132,7 @@ func DeepCopy_federation_ClusterStatus(in interface{}, out interface{}, c *conve
{
in := in.(*ClusterStatus)
out := out.(*ClusterStatus)
*out = *in
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
*out = make([]ClusterCondition, len(*in))
@@ -152,17 +141,12 @@ func DeepCopy_federation_ClusterStatus(in interface{}, out interface{}, c *conve
return err
}
}
} else {
out.Conditions = nil
}
if in.Zones != nil {
in, out := &in.Zones, &out.Zones
*out = make([]string, len(*in))
copy(*out, *in)
} else {
out.Zones = nil
}
out.Region = in.Region
return nil
}
}
@@ -171,7 +155,7 @@ func DeepCopy_federation_FederatedReplicaSetPreferences(in interface{}, out inte
{
in := in.(*FederatedReplicaSetPreferences)
out := out.(*FederatedReplicaSetPreferences)
out.Rebalance = in.Rebalance
*out = *in
if in.Clusters != nil {
in, out := &in.Clusters, &out.Clusters
*out = make(map[string]ClusterReplicaSetPreferences)
@@ -182,8 +166,6 @@ func DeepCopy_federation_FederatedReplicaSetPreferences(in interface{}, out inte
}
(*out)[key] = *newVal
}
} else {
out.Clusters = nil
}
return nil
}
@@ -193,8 +175,7 @@ func DeepCopy_federation_ServerAddressByClientCIDR(in interface{}, out interface
{
in := in.(*ServerAddressByClientCIDR)
out := out.(*ServerAddressByClientCIDR)
out.ClientCIDR = in.ClientCIDR
out.ServerAddress = in.ServerAddress
*out = *in
return nil
}
}