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

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

bump gengo to latest

bumping gengo to limit surprises while working on kubernetes#39475

@kubernetes/sig-api-machinery-misc

cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go

@@ -47,14 +47,13 @@ func DeepCopy_v1alpha1_APIService(in interface{}, out interface{}, c *conversion
 	{
 		in := in.(*APIService)
 		out := out.(*APIService)
-		out.TypeMeta = in.TypeMeta
+		*out = *in
 		if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 			return err
 		}
 		if err := DeepCopy_v1alpha1_APIServiceSpec(&in.Spec, &out.Spec, c); err != nil {
 			return err
 		}
-		out.Status = in.Status
 		return nil
 	}
 }
@@ -63,8 +62,7 @@ func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conver
 	{
 		in := in.(*APIServiceList)
 		out := out.(*APIServiceList)
-		out.TypeMeta = in.TypeMeta
-		out.ListMeta = in.ListMeta
+		*out = *in
 		if in.Items != nil {
 			in, out := &in.Items, &out.Items
 			*out = make([]APIService, len(*in))
@@ -73,8 +71,6 @@ func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conver
 					return err
 				}
 			}
-		} else {
-			out.Items = nil
 		}
 		return nil
 	}
@@ -84,18 +80,12 @@ func DeepCopy_v1alpha1_APIServiceSpec(in interface{}, out interface{}, c *conver
 	{
 		in := in.(*APIServiceSpec)
 		out := out.(*APIServiceSpec)
-		out.Service = in.Service
-		out.Group = in.Group
-		out.Version = in.Version
-		out.InsecureSkipTLSVerify = in.InsecureSkipTLSVerify
+		*out = *in
 		if in.CABundle != nil {
 			in, out := &in.CABundle, &out.CABundle
 			*out = make([]byte, len(*in))
 			copy(*out, *in)
-		} else {
-			out.CABundle = nil
 		}
-		out.Priority = in.Priority
 		return nil
 	}
 }
@@ -104,8 +94,7 @@ func DeepCopy_v1alpha1_APIServiceStatus(in interface{}, out interface{}, c *conv
 	{
 		in := in.(*APIServiceStatus)
 		out := out.(*APIServiceStatus)
-		_ = in
-		_ = out
+		*out = *in
 		return nil
 	}
 }
@@ -114,8 +103,7 @@ func DeepCopy_v1alpha1_ServiceReference(in interface{}, out interface{}, c *conv
 	{
 		in := in.(*ServiceReference)
 		out := out.(*ServiceReference)
-		out.Namespace = in.Namespace
-		out.Name = in.Name
+		*out = *in
 		return nil
 	}
 }

cmd/kubernetes-discovery/pkg/apis/apiregistration/zz_generated.deepcopy.go

@@ -47,14 +47,13 @@ func DeepCopy_apiregistration_APIService(in interface{}, out interface{}, c *con
 	{
 		in := in.(*APIService)
 		out := out.(*APIService)
-		out.TypeMeta = in.TypeMeta
+		*out = *in
 		if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
 			return err
 		}
 		if err := DeepCopy_apiregistration_APIServiceSpec(&in.Spec, &out.Spec, c); err != nil {
 			return err
 		}
-		out.Status = in.Status
 		return nil
 	}
 }
@@ -63,8 +62,7 @@ func DeepCopy_apiregistration_APIServiceList(in interface{}, out interface{}, c
 	{
 		in := in.(*APIServiceList)
 		out := out.(*APIServiceList)
-		out.TypeMeta = in.TypeMeta
-		out.ListMeta = in.ListMeta
+		*out = *in
 		if in.Items != nil {
 			in, out := &in.Items, &out.Items
 			*out = make([]APIService, len(*in))
@@ -73,8 +71,6 @@ func DeepCopy_apiregistration_APIServiceList(in interface{}, out interface{}, c
 					return err
 				}
 			}
-		} else {
-			out.Items = nil
 		}
 		return nil
 	}
@@ -84,18 +80,12 @@ func DeepCopy_apiregistration_APIServiceSpec(in interface{}, out interface{}, c
 	{
 		in := in.(*APIServiceSpec)
 		out := out.(*APIServiceSpec)
-		out.Service = in.Service
-		out.Group = in.Group
-		out.Version = in.Version
-		out.InsecureSkipTLSVerify = in.InsecureSkipTLSVerify
+		*out = *in
 		if in.CABundle != nil {
 			in, out := &in.CABundle, &out.CABundle
 			*out = make([]byte, len(*in))
 			copy(*out, *in)
-		} else {
-			out.CABundle = nil
 		}
-		out.Priority = in.Priority
 		return nil
 	}
 }
@@ -104,8 +94,7 @@ func DeepCopy_apiregistration_APIServiceStatus(in interface{}, out interface{},
 	{
 		in := in.(*APIServiceStatus)
 		out := out.(*APIServiceStatus)
-		_ = in
-		_ = out
+		*out = *in
 		return nil
 	}
 }
@@ -114,8 +103,7 @@ func DeepCopy_apiregistration_ServiceReference(in interface{}, out interface{},
 	{
 		in := in.(*ServiceReference)
 		out := out.(*ServiceReference)
-		out.Namespace = in.Namespace
-		out.Name = in.Name
+		*out = *in
 		return nil
 	}
 }

cmd/libs/go2idl/openapi-gen/generators/openapi_test.go

@@ -33,7 +33,7 @@ import (
 func construct(t *testing.T, files map[string]string, testNamer namer.Namer) (*parser.Builder, types.Universe, []*types.Type) {
 	b := parser.New()
 	for name, src := range files {
-		if err := b.AddFile(filepath.Dir(name), name, []byte(src)); err != nil {
+		if err := b.AddFileForTest(filepath.Dir(name), name, []byte(src)); err != nil {
 			t.Fatal(err)
 		}
 	}

federation/apis/federation/v1beta1/BUILD

@@ -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 = [

federation/apis/federation/v1beta1/zz_generated.deepcopy.go

@@ -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
 	}
 }

federation/apis/federation/v1beta1/zz_generated.defaults.go

@@ -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
+}