From e41f41f47bbe011f06afa20083d0b401ec89d5c8 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Thu, 14 Mar 2019 20:44:26 -0400 Subject: [PATCH] Update apimachinery --- .../kops/v1alpha1/zz_generated.conversion.go | 48 +++++++++++++++++++ .../kops/v1alpha1/zz_generated.deepcopy.go | 8 +--- .../kops/v1alpha2/zz_generated.conversion.go | 48 +++++++++++++++++++ .../kops/v1alpha2/zz_generated.deepcopy.go | 8 +--- pkg/apis/kops/zz_generated.deepcopy.go | 8 +--- 5 files changed, 102 insertions(+), 18 deletions(-) diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index ea59dcae63..2a53ef1626 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -343,6 +343,16 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*GCENetworkingSpec)(nil), (*kops.GCENetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec(a.(*GCENetworkingSpec), b.(*kops.GCENetworkingSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*kops.GCENetworkingSpec)(nil), (*GCENetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec(a.(*kops.GCENetworkingSpec), b.(*GCENetworkingSpec), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*HTTPProxy)(nil), (*kops.HTTPProxy)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha1_HTTPProxy_To_kops_HTTPProxy(a.(*HTTPProxy), b.(*kops.HTTPProxy), scope) }); err != nil { @@ -1530,6 +1540,7 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * out.ClusterDNSDomain = in.ClusterDNSDomain // WARNING: in.Multizone requires manual conversion: does not exist in peer-type out.ServiceClusterIPRange = in.ServiceClusterIPRange + out.PodCIDR = in.PodCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR // WARNING: in.AdminAccess requires manual conversion: does not exist in peer-type out.IsolateMasters = in.IsolateMasters @@ -1795,6 +1806,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec, out.AdditionalSANs = in.AdditionalSANs out.ClusterDNSDomain = in.ClusterDNSDomain out.ServiceClusterIPRange = in.ServiceClusterIPRange + out.PodCIDR = in.PodCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR // WARNING: in.SSHAccess requires manual conversion: does not exist in peer-type // WARNING: in.NodePortAccess requires manual conversion: does not exist in peer-type @@ -2445,6 +2457,24 @@ func Convert_kops_FlannelNetworkingSpec_To_v1alpha1_FlannelNetworkingSpec(in *ko return autoConvert_kops_FlannelNetworkingSpec_To_v1alpha1_FlannelNetworkingSpec(in, out, s) } +func autoConvert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec(in *GCENetworkingSpec, out *kops.GCENetworkingSpec, s conversion.Scope) error { + return nil +} + +// Convert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec is an autogenerated conversion function. +func Convert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec(in *GCENetworkingSpec, out *kops.GCENetworkingSpec, s conversion.Scope) error { + return autoConvert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec(in, out, s) +} + +func autoConvert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec(in *kops.GCENetworkingSpec, out *GCENetworkingSpec, s conversion.Scope) error { + return nil +} + +// Convert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec is an autogenerated conversion function. +func Convert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec(in *kops.GCENetworkingSpec, out *GCENetworkingSpec, s conversion.Scope) error { + return autoConvert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec(in, out, s) +} + func autoConvert_v1alpha1_HTTPProxy_To_kops_HTTPProxy(in *HTTPProxy, out *kops.HTTPProxy, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port @@ -3799,6 +3829,15 @@ func autoConvert_v1alpha1_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.LyftVPC = nil } + if in.GCE != nil { + in, out := &in.GCE, &out.GCE + *out = new(kops.GCENetworkingSpec) + if err := Convert_v1alpha1_GCENetworkingSpec_To_kops_GCENetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.GCE = nil + } return nil } @@ -3934,6 +3973,15 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha1_NetworkingSpec(in *kops.Network } else { out.LyftVPC = nil } + if in.GCE != nil { + in, out := &in.GCE, &out.GCE + *out = new(GCENetworkingSpec) + if err := Convert_kops_GCENetworkingSpec_To_v1alpha1_GCENetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.GCE = nil + } return nil } diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go index ca8e530577..6e42d1e008 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go @@ -2653,12 +2653,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { } if in.GCE != nil { in, out := &in.GCE, &out.GCE - if *in == nil { - *out = nil - } else { - *out = new(GCENetworkingSpec) - **out = **in - } + *out = new(GCENetworkingSpec) + **out = **in } return } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 6a30264a10..6bb23a1285 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -363,6 +363,16 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*GCENetworkingSpec)(nil), (*kops.GCENetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec(a.(*GCENetworkingSpec), b.(*kops.GCENetworkingSpec), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*kops.GCENetworkingSpec)(nil), (*GCENetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec(a.(*kops.GCENetworkingSpec), b.(*GCENetworkingSpec), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*HTTPProxy)(nil), (*kops.HTTPProxy)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha2_HTTPProxy_To_kops_HTTPProxy(a.(*HTTPProxy), b.(*kops.HTTPProxy), scope) }); err != nil { @@ -1581,6 +1591,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out * out.AdditionalSANs = in.AdditionalSANs out.ClusterDNSDomain = in.ClusterDNSDomain out.ServiceClusterIPRange = in.ServiceClusterIPRange + out.PodCIDR = in.PodCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.SSHAccess = in.SSHAccess out.NodePortAccess = in.NodePortAccess @@ -1863,6 +1874,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec, out.AdditionalSANs = in.AdditionalSANs out.ClusterDNSDomain = in.ClusterDNSDomain out.ServiceClusterIPRange = in.ServiceClusterIPRange + out.PodCIDR = in.PodCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.SSHAccess = in.SSHAccess out.NodePortAccess = in.NodePortAccess @@ -2562,6 +2574,24 @@ func Convert_kops_FlannelNetworkingSpec_To_v1alpha2_FlannelNetworkingSpec(in *ko return autoConvert_kops_FlannelNetworkingSpec_To_v1alpha2_FlannelNetworkingSpec(in, out, s) } +func autoConvert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec(in *GCENetworkingSpec, out *kops.GCENetworkingSpec, s conversion.Scope) error { + return nil +} + +// Convert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec is an autogenerated conversion function. +func Convert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec(in *GCENetworkingSpec, out *kops.GCENetworkingSpec, s conversion.Scope) error { + return autoConvert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec(in, out, s) +} + +func autoConvert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec(in *kops.GCENetworkingSpec, out *GCENetworkingSpec, s conversion.Scope) error { + return nil +} + +// Convert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec is an autogenerated conversion function. +func Convert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec(in *kops.GCENetworkingSpec, out *GCENetworkingSpec, s conversion.Scope) error { + return autoConvert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec(in, out, s) +} + func autoConvert_v1alpha2_HTTPProxy_To_kops_HTTPProxy(in *HTTPProxy, out *kops.HTTPProxy, s conversion.Scope) error { out.Host = in.Host out.Port = in.Port @@ -4069,6 +4099,15 @@ func autoConvert_v1alpha2_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.LyftVPC = nil } + if in.GCE != nil { + in, out := &in.GCE, &out.GCE + *out = new(kops.GCENetworkingSpec) + if err := Convert_v1alpha2_GCENetworkingSpec_To_kops_GCENetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.GCE = nil + } return nil } @@ -4204,6 +4243,15 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha2_NetworkingSpec(in *kops.Network } else { out.LyftVPC = nil } + if in.GCE != nil { + in, out := &in.GCE, &out.GCE + *out = new(GCENetworkingSpec) + if err := Convert_kops_GCENetworkingSpec_To_v1alpha2_GCENetworkingSpec(*in, *out, s); err != nil { + return err + } + } else { + out.GCE = nil + } return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index abdbe6fa07..d9f4059227 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -2724,12 +2724,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { } if in.GCE != nil { in, out := &in.GCE, &out.GCE - if *in == nil { - *out = nil - } else { - *out = new(GCENetworkingSpec) - **out = **in - } + *out = new(GCENetworkingSpec) + **out = **in } return } diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 4683dcb9b6..9cb79c6636 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -2922,12 +2922,8 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { } if in.GCE != nil { in, out := &in.GCE, &out.GCE - if *in == nil { - *out = nil - } else { - *out = new(GCENetworkingSpec) - **out = **in - } + *out = new(GCENetworkingSpec) + **out = **in } return }