From 847b048fa0b2e83d4d4c39ceb37e9e0262d5a968 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 22 Jun 2017 11:16:57 -0700 Subject: [PATCH] make all works. generated harmless covnersion/deepcoy chagnes --- .../apis/audit/v1alpha1/zz_generated.conversion.go | 2 +- .../pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go | 11 ++++------- .../apis/metrics/v1alpha1/zz_generated.conversion.go | 2 +- .../apis/metrics/v1alpha1/zz_generated.deepcopy.go | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go index 3835763d8e2..972dca99f0c 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go @@ -21,12 +21,12 @@ limitations under the License. package v1alpha1 import ( + authentication_v1 "k8s.io/api/authentication/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" types "k8s.io/apimachinery/pkg/types" audit "k8s.io/apiserver/pkg/apis/audit" - authentication_v1 "k8s.io/api/authentication/v1" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go index ee833af9665..6072f4d963f 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go @@ -21,10 +21,10 @@ limitations under the License. package v1alpha1 import ( + authentication_v1 "k8s.io/api/authentication/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authentication_v1 "k8s.io/api/authentication/v1" reflect "reflect" ) @@ -58,17 +58,14 @@ func DeepCopy_v1alpha1_Event(in interface{}, out interface{}, c *conversion.Clon out.ObjectMeta = *newVal.(*v1.ObjectMeta) } out.Timestamp = in.Timestamp.DeepCopy() - if newVal, err := c.DeepCopy(&in.User); err != nil { + if err := authentication_v1.DeepCopy_v1_UserInfo(&in.User, &out.User, c); err != nil { return err - } else { - out.User = *newVal.(*authentication_v1.UserInfo) } if in.ImpersonatedUser != nil { in, out := &in.ImpersonatedUser, &out.ImpersonatedUser - if newVal, err := c.DeepCopy(*in); err != nil { + *out = new(authentication_v1.UserInfo) + if err := authentication_v1.DeepCopy_v1_UserInfo(*in, *out, c); err != nil { return err - } else { - *out = newVal.(*authentication_v1.UserInfo) } } if in.SourceIPs != nil { diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go index 88cb39b9920..b39ae569a5e 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go @@ -21,9 +21,9 @@ limitations under the License. package v1alpha1 import ( + v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/api/core/v1" metrics "k8s.io/metrics/pkg/apis/metrics" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go index 83abb21848d..d15fcf457ad 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go @@ -21,10 +21,10 @@ limitations under the License. package v1alpha1 import ( + v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/api/core/v1" reflect "reflect" )