From 4575fc200e54e8653ab34afbbef99ce5419191e5 Mon Sep 17 00:00:00 2001 From: Maciej Kwiek Date: Mon, 8 Jan 2018 17:01:40 +0100 Subject: [PATCH] make apimachinery generated changes Signed-off-by: Maciej Kwiek --- .../kops/v1alpha1/zz_generated.conversion.go | 42 +++++++++++++++++++ .../kops/v1alpha1/zz_generated.deepcopy.go | 25 +++++++++++ .../kops/v1alpha2/zz_generated.conversion.go | 42 +++++++++++++++++++ .../kops/v1alpha2/zz_generated.deepcopy.go | 25 +++++++++++ pkg/apis/kops/zz_generated.deepcopy.go | 25 +++++++++++ .../clientset/scheme/register.go | 3 +- .../internalclientset/scheme/register.go | 3 +- 7 files changed, 161 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index cb04f4f824..b756209227 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -55,6 +55,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_kops_CalicoNetworkingSpec_To_v1alpha1_CalicoNetworkingSpec, Convert_v1alpha1_CanalNetworkingSpec_To_kops_CanalNetworkingSpec, Convert_kops_CanalNetworkingSpec_To_v1alpha1_CanalNetworkingSpec, + Convert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec, + Convert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec, Convert_v1alpha1_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec, Convert_kops_ClassicNetworkingSpec_To_v1alpha1_ClassicNetworkingSpec, Convert_v1alpha1_CloudConfiguration_To_kops_CloudConfiguration, @@ -448,6 +450,28 @@ func Convert_kops_CanalNetworkingSpec_To_v1alpha1_CanalNetworkingSpec(in *kops.C return autoConvert_kops_CanalNetworkingSpec_To_v1alpha1_CanalNetworkingSpec(in, out, s) } +func autoConvert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *CiliumNetworkingSpec, out *kops.CiliumNetworkingSpec, s conversion.Scope) error { + out.Debug = in.Debug + out.Tunnel = in.Tunnel + return nil +} + +// Convert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec is an autogenerated conversion function. +func Convert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *CiliumNetworkingSpec, out *kops.CiliumNetworkingSpec, s conversion.Scope) error { + return autoConvert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in, out, s) +} + +func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(in *kops.CiliumNetworkingSpec, out *CiliumNetworkingSpec, s conversion.Scope) error { + out.Debug = in.Debug + out.Tunnel = in.Tunnel + return nil +} + +// Convert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec is an autogenerated conversion function. +func Convert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(in *kops.CiliumNetworkingSpec, out *CiliumNetworkingSpec, s conversion.Scope) error { + return autoConvert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(in, out, s) +} + func autoConvert_v1alpha1_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(in *ClassicNetworkingSpec, out *kops.ClassicNetworkingSpec, s conversion.Scope) error { return nil } @@ -2491,6 +2515,15 @@ func autoConvert_v1alpha1_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.AmazonVPC = nil } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + *out = new(kops.CiliumNetworkingSpec) + if err := Convert_v1alpha1_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.Cilium = nil + } return nil } @@ -2608,6 +2641,15 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha1_NetworkingSpec(in *kops.Network } else { out.AmazonVPC = nil } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + *out = new(CiliumNetworkingSpec) + if err := Convert_kops_CiliumNetworkingSpec_To_v1alpha1_CiliumNetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.Cilium = nil + } return nil } diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go index 31984fe13f..27a2c6bfd8 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go @@ -273,6 +273,22 @@ func (in *CanalNetworkingSpec) DeepCopy() *CanalNetworkingSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumNetworkingSpec. +func (in *CiliumNetworkingSpec) DeepCopy() *CiliumNetworkingSpec { + if in == nil { + return nil + } + out := new(CiliumNetworkingSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClassicNetworkingSpec) DeepCopyInto(out *ClassicNetworkingSpec) { *out = *in @@ -2604,6 +2620,15 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { **out = **in } } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + if *in == nil { + *out = nil + } else { + *out = new(CiliumNetworkingSpec) + **out = **in + } + } return } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 65a3194938..3e0cebf380 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -57,6 +57,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_kops_CalicoNetworkingSpec_To_v1alpha2_CalicoNetworkingSpec, Convert_v1alpha2_CanalNetworkingSpec_To_kops_CanalNetworkingSpec, Convert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec, + Convert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec, + Convert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec, Convert_v1alpha2_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec, Convert_kops_ClassicNetworkingSpec_To_v1alpha2_ClassicNetworkingSpec, Convert_v1alpha2_CloudConfiguration_To_kops_CloudConfiguration, @@ -484,6 +486,28 @@ func Convert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec(in *kops.C return autoConvert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec(in, out, s) } +func autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *CiliumNetworkingSpec, out *kops.CiliumNetworkingSpec, s conversion.Scope) error { + out.Debug = in.Debug + out.Tunnel = in.Tunnel + return nil +} + +// Convert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec is an autogenerated conversion function. +func Convert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in *CiliumNetworkingSpec, out *kops.CiliumNetworkingSpec, s conversion.Scope) error { + return autoConvert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(in, out, s) +} + +func autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *kops.CiliumNetworkingSpec, out *CiliumNetworkingSpec, s conversion.Scope) error { + out.Debug = in.Debug + out.Tunnel = in.Tunnel + return nil +} + +// Convert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec is an autogenerated conversion function. +func Convert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in *kops.CiliumNetworkingSpec, out *CiliumNetworkingSpec, s conversion.Scope) error { + return autoConvert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(in, out, s) +} + func autoConvert_v1alpha2_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(in *ClassicNetworkingSpec, out *kops.ClassicNetworkingSpec, s conversion.Scope) error { return nil } @@ -2755,6 +2779,15 @@ func autoConvert_v1alpha2_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.AmazonVPC = nil } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + *out = new(kops.CiliumNetworkingSpec) + if err := Convert_v1alpha2_CiliumNetworkingSpec_To_kops_CiliumNetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.Cilium = nil + } return nil } @@ -2872,6 +2905,15 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha2_NetworkingSpec(in *kops.Network } else { out.AmazonVPC = nil } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + *out = new(CiliumNetworkingSpec) + if err := Convert_kops_CiliumNetworkingSpec_To_v1alpha2_CiliumNetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.Cilium = nil + } return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 2aed404b57..271aa2e282 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -273,6 +273,22 @@ func (in *CanalNetworkingSpec) DeepCopy() *CanalNetworkingSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumNetworkingSpec. +func (in *CiliumNetworkingSpec) DeepCopy() *CiliumNetworkingSpec { + if in == nil { + return nil + } + out := new(CiliumNetworkingSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClassicNetworkingSpec) DeepCopyInto(out *ClassicNetworkingSpec) { *out = *in @@ -2712,6 +2728,15 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { **out = **in } } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + if *in == nil { + *out = nil + } else { + *out = new(CiliumNetworkingSpec) + **out = **in + } + } return } diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 46bf08191d..b7a93f28d5 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -378,6 +378,22 @@ func (in *ChannelSpec) DeepCopy() *ChannelSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumNetworkingSpec) DeepCopyInto(out *CiliumNetworkingSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumNetworkingSpec. +func (in *CiliumNetworkingSpec) DeepCopy() *CiliumNetworkingSpec { + if in == nil { + return nil + } + out := new(CiliumNetworkingSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClassicNetworkingSpec) DeepCopyInto(out *ClassicNetworkingSpec) { *out = *in @@ -2907,6 +2923,15 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { **out = **in } } + if in.Cilium != nil { + in, out := &in.Cilium, &out.Cilium + if *in == nil { + *out = nil + } else { + *out = new(CiliumNetworkingSpec) + **out = **in + } + } return } diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go index 3d4d4a981f..cc01994808 100644 --- a/pkg/client/clientset_generated/clientset/scheme/register.go +++ b/pkg/client/clientset_generated/clientset/scheme/register.go @@ -17,8 +17,6 @@ limitations under the License. package scheme import ( - os "os" - announced "k8s.io/apimachinery/pkg/apimachinery/announced" registered "k8s.io/apimachinery/pkg/apimachinery/registered" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -26,6 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" kops "k8s.io/kops/pkg/apis/kops/install" + os "os" ) var Scheme = runtime.NewScheme() diff --git a/pkg/client/clientset_generated/internalclientset/scheme/register.go b/pkg/client/clientset_generated/internalclientset/scheme/register.go index 3d4d4a981f..cc01994808 100644 --- a/pkg/client/clientset_generated/internalclientset/scheme/register.go +++ b/pkg/client/clientset_generated/internalclientset/scheme/register.go @@ -17,8 +17,6 @@ limitations under the License. package scheme import ( - os "os" - announced "k8s.io/apimachinery/pkg/apimachinery/announced" registered "k8s.io/apimachinery/pkg/apimachinery/registered" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -26,6 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" kops "k8s.io/kops/pkg/apis/kops/install" + os "os" ) var Scheme = runtime.NewScheme()