diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index a52621e1a4..810ac2bc2d 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -4275,8 +4275,7 @@ spec: level. (Default: info)' type: string majorVersion: - description: MajorVersion is deprecated as of kOps 1.20 and - has no effect + description: MajorVersion is unused. type: string mtu: description: MTU to be set in the cni-network-config for calico. @@ -4301,7 +4300,7 @@ spec: process metrics collection type: boolean registry: - description: Version overrides the Calico container image + description: Registry overrides the Calico container image registry. type: string typhaPrometheusMetricsEnabled: @@ -4366,8 +4365,7 @@ spec: FORWARD chain type: boolean disableTxChecksumOffloading: - description: DisableTxChecksumOffloading is deprecated as - of kOps 1.19 and has no effect. + description: DisableTxChecksumOffloading is unused. type: boolean iptablesBackend: description: 'IptablesBackend controls which variant of iptables @@ -4888,8 +4886,7 @@ spec: use (vxlan or udp) type: string disableTxChecksumOffloading: - description: DisableTxChecksumOffloading is deprecated as - of kOps 1.19 and has no effect. + description: DisableTxChecksumOffloading is unused. type: boolean iptablesResyncSeconds: description: IptablesResyncSeconds sets resync period for diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 55756341c5..a7d1e52905 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -95,15 +95,13 @@ type WeaveNetworkingSpec struct { type FlannelNetworkingSpec struct { // Backend is the backend overlay type we want to use (vxlan or udp) Backend string `json:"backend,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. - DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesResyncSeconds sets resync period for iptables rules, in seconds IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` } // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { - // Version overrides the Calico container image registry. + // Registry overrides the Calico container image registry. Registry string `json:"registry,omitempty"` // Version overrides the Calico container image tag. Version string `json:"version,omitempty"` @@ -175,8 +173,6 @@ type CalicoNetworkingSpec struct { PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"` // PrometheusProcessMetricsEnabled enables Prometheus process metrics collection PrometheusProcessMetricsEnabled bool `json:"prometheusProcessMetricsEnabled,omitempty"` - // MajorVersion is deprecated as of kOps 1.20 and has no effect - MajorVersion string `json:"majorVersion,omitempty"` // TyphaPrometheusMetricsEnabled enables Prometheus metrics collection from Typha // (default: false) TyphaPrometheusMetricsEnabled bool `json:"typhaPrometheusMetricsEnabled,omitempty"` @@ -211,8 +207,6 @@ type CanalNetworkingSpec struct { // DisableFlannelForwardRules configures Flannel to NOT add the // default ACCEPT traffic rules to the iptables FORWARD chain DisableFlannelForwardRules bool `json:"disableFlannelForwardRules,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. - DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesBackend controls which variant of iptables binary Felix uses // Default: Auto (other options: Legacy, NFT) IptablesBackend string `json:"iptablesBackend,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index 2054ce867d..99fa828b07 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -95,7 +95,8 @@ type WeaveNetworkingSpec struct { type FlannelNetworkingSpec struct { // Backend is the backend overlay type we want to use (vxlan or udp) Backend string `json:"backend,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. + // DisableTxChecksumOffloading is unused. + // +k8s:conversion-gen=false DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesResyncSeconds sets resync period for iptables rules, in seconds IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` @@ -103,7 +104,7 @@ type FlannelNetworkingSpec struct { // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { - // Version overrides the Calico container image registry. + // Registry overrides the Calico container image registry. Registry string `json:"registry,omitempty"` // Version overrides the Calico container image tag. Version string `json:"version,omitempty"` @@ -175,7 +176,8 @@ type CalicoNetworkingSpec struct { PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"` // PrometheusProcessMetricsEnabled enables Prometheus process metrics collection PrometheusProcessMetricsEnabled bool `json:"prometheusProcessMetricsEnabled,omitempty"` - // MajorVersion is deprecated as of kOps 1.20 and has no effect + // MajorVersion is unused. + // +k8s:conversion-gen=false MajorVersion string `json:"majorVersion,omitempty"` // TyphaPrometheusMetricsEnabled enables Prometheus metrics collection from Typha // (default: false) @@ -211,7 +213,8 @@ type CanalNetworkingSpec struct { // DisableFlannelForwardRules configures Flannel to NOT add the // default ACCEPT traffic rules to the iptables FORWARD chain DisableFlannelForwardRules bool `json:"disableFlannelForwardRules,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. + // DisableTxChecksumOffloading is unused. + // +k8s:conversion-gen=false DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesBackend controls which variant of iptables binary Felix uses // Default: Auto (other options: Legacy, NFT) diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index ded2978440..b1c5bb9240 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -1671,7 +1671,7 @@ func autoConvert_v1alpha2_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in * out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusProcessMetricsEnabled = in.PrometheusProcessMetricsEnabled - out.MajorVersion = in.MajorVersion + // INFO: in.MajorVersion opted out of conversion generation out.TyphaPrometheusMetricsEnabled = in.TyphaPrometheusMetricsEnabled out.TyphaPrometheusMetricsPort = in.TyphaPrometheusMetricsPort out.TyphaReplicas = in.TyphaReplicas @@ -1707,7 +1707,6 @@ func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha2_CalicoNetworkingSpec(in * out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusProcessMetricsEnabled = in.PrometheusProcessMetricsEnabled - out.MajorVersion = in.MajorVersion out.TyphaPrometheusMetricsEnabled = in.TyphaPrometheusMetricsEnabled out.TyphaPrometheusMetricsPort = in.TyphaPrometheusMetricsPort out.TyphaReplicas = in.TyphaReplicas @@ -1726,7 +1725,7 @@ func autoConvert_v1alpha2_CanalNetworkingSpec_To_kops_CanalNetworkingSpec(in *Ca out.CPURequest = in.CPURequest out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DisableFlannelForwardRules = in.DisableFlannelForwardRules - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading + // INFO: in.DisableTxChecksumOffloading opted out of conversion generation out.IptablesBackend = in.IptablesBackend out.LogSeveritySys = in.LogSeveritySys out.MTU = in.MTU @@ -1750,7 +1749,6 @@ func autoConvert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec(in *ko out.CPURequest = in.CPURequest out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DisableFlannelForwardRules = in.DisableFlannelForwardRules - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesBackend = in.IptablesBackend out.LogSeveritySys = in.LogSeveritySys out.MTU = in.MTU @@ -3797,7 +3795,7 @@ func Convert_kops_FileAssetSpec_To_v1alpha2_FileAssetSpec(in *kops.FileAssetSpec func autoConvert_v1alpha2_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *FlannelNetworkingSpec, out *kops.FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading + // INFO: in.DisableTxChecksumOffloading opted out of conversion generation out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } @@ -3809,7 +3807,6 @@ func Convert_v1alpha2_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *Fl func autoConvert_kops_FlannelNetworkingSpec_To_v1alpha2_FlannelNetworkingSpec(in *kops.FlannelNetworkingSpec, out *FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } diff --git a/pkg/apis/kops/v1alpha3/networking.go b/pkg/apis/kops/v1alpha3/networking.go index 223f96e0e3..022c90fc30 100644 --- a/pkg/apis/kops/v1alpha3/networking.go +++ b/pkg/apis/kops/v1alpha3/networking.go @@ -16,30 +16,28 @@ limitations under the License. package v1alpha3 -import "k8s.io/apimachinery/pkg/api/resource" +import ( + "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/kops/pkg/apis/kops" +) // NetworkingSpec allows selection and configuration of a networking plugin type NetworkingSpec struct { - Classic *ClassicNetworkingSpec `json:"classic,omitempty"` - Kubenet *KubenetNetworkingSpec `json:"kubenet,omitempty"` - External *ExternalNetworkingSpec `json:"external,omitempty"` - CNI *CNINetworkingSpec `json:"cni,omitempty"` - Kopeio *KopeioNetworkingSpec `json:"kopeio,omitempty"` - Weave *WeaveNetworkingSpec `json:"weave,omitempty"` - Flannel *FlannelNetworkingSpec `json:"flannel,omitempty"` - Calico *CalicoNetworkingSpec `json:"calico,omitempty"` - Canal *CanalNetworkingSpec `json:"canal,omitempty"` - Kuberouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` - Romana *RomanaNetworkingSpec `json:"romana,omitempty"` - AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonvpc,omitempty"` - Cilium *CiliumNetworkingSpec `json:"cilium,omitempty"` - LyftVPC *LyftVPCNetworkingSpec `json:"lyftvpc,omitempty"` - GCE *GCENetworkingSpec `json:"gce,omitempty"` -} - -// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes. -// Support been removed since Kubernetes 1.4. -type ClassicNetworkingSpec struct { + Classic *kops.ClassicNetworkingSpec `json:"-"` + Kubenet *KubenetNetworkingSpec `json:"kubenet,omitempty"` + External *ExternalNetworkingSpec `json:"external,omitempty"` + CNI *CNINetworkingSpec `json:"cni,omitempty"` + Kopeio *KopeioNetworkingSpec `json:"kopeio,omitempty"` + Weave *WeaveNetworkingSpec `json:"weave,omitempty"` + Flannel *FlannelNetworkingSpec `json:"flannel,omitempty"` + Calico *CalicoNetworkingSpec `json:"calico,omitempty"` + Canal *CanalNetworkingSpec `json:"canal,omitempty"` + Kuberouter *KuberouterNetworkingSpec `json:"kuberouter,omitempty"` + Romana *kops.RomanaNetworkingSpec `json:"-"` + AmazonVPC *AmazonVPCNetworkingSpec `json:"amazonvpc,omitempty"` + Cilium *CiliumNetworkingSpec `json:"cilium,omitempty"` + LyftVPC *kops.LyftVPCNetworkingSpec `json:"-"` + GCE *GCENetworkingSpec `json:"gce,omitempty"` } // KubenetNetworkingSpec is the specification for kubenet networking, largely integrated but intended to replace classic @@ -95,15 +93,13 @@ type WeaveNetworkingSpec struct { type FlannelNetworkingSpec struct { // Backend is the backend overlay type we want to use (vxlan or udp) Backend string `json:"backend,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. - DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesResyncSeconds sets resync period for iptables rules, in seconds IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` } // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { - // Version overrides the Calico container image registry. + // Registry overrides the Calico container image registry. Registry string `json:"registry,omitempty"` // Version overrides the Calico container image tag. Version string `json:"version,omitempty"` @@ -133,7 +129,7 @@ type CalicoNetworkingSpec struct { // CPURequest CPU request of Calico container. Default: 100m CPURequest *resource.Quantity `json:"cpuRequest,omitempty"` // CrossSubnet is deprecated as of kOps 1.22 and has no effect - CrossSubnet *bool `json:"crossSubnet,omitempty"` + CrossSubnet *bool `json:"-"` // EncapsulationMode specifies the network packet encapsulation protocol for Calico to use, // employing such encapsulation at the necessary scope per the related CrossSubnet field. In // "ipip" mode, Calico will use IP-in-IP encapsulation as needed. In "vxlan" mode, Calico will @@ -175,8 +171,6 @@ type CalicoNetworkingSpec struct { PrometheusGoMetricsEnabled bool `json:"prometheusGoMetricsEnabled,omitempty"` // PrometheusProcessMetricsEnabled enables Prometheus process metrics collection PrometheusProcessMetricsEnabled bool `json:"prometheusProcessMetricsEnabled,omitempty"` - // MajorVersion is deprecated as of kOps 1.20 and has no effect - MajorVersion string `json:"majorVersion,omitempty"` // TyphaPrometheusMetricsEnabled enables Prometheus metrics collection from Typha // (default: false) TyphaPrometheusMetricsEnabled bool `json:"typhaPrometheusMetricsEnabled,omitempty"` @@ -211,8 +205,6 @@ type CanalNetworkingSpec struct { // DisableFlannelForwardRules configures Flannel to NOT add the // default ACCEPT traffic rules to the iptables FORWARD chain DisableFlannelForwardRules bool `json:"disableFlannelForwardRules,omitempty"` - // DisableTxChecksumOffloading is deprecated as of kOps 1.19 and has no effect. - DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"` // IptablesBackend controls which variant of iptables binary Felix uses // Default: Auto (other options: Legacy, NFT) IptablesBackend string `json:"iptablesBackend,omitempty"` @@ -245,15 +237,6 @@ type CanalNetworkingSpec struct { type KuberouterNetworkingSpec struct { } -// RomanaNetworkingSpec declares that we want Romana networking -// Romana is deprecated as of kOps 1.18 and removed as of kOps 1.19. -type RomanaNetworkingSpec struct { - // DaemonServiceIP is the Kubernetes Service IP for the romana-daemon pod - DaemonServiceIP string `json:"daemonServiceIP,omitempty"` - // EtcdServiceIP is the Kubernetes Service IP for the etcd backend used by Romana - EtcdServiceIP string `json:"etcdServiceIP,omitempty"` -} - // AmazonVPCNetworkingSpec declares that we want Amazon VPC CNI networking type AmazonVPCNetworkingSpec struct { // ImageName is the container image name to use. @@ -580,12 +563,6 @@ type HubbleSpec struct { Metrics []string `json:"metrics,omitempty"` } -// LyftVPCNetworkingSpec declares that we want to use the cni-ipvlan-vpc-k8s CNI networking. -// Lyft VPC is deprecated as of kOps 1.22 and removed as of kOps 1.23. -type LyftVPCNetworkingSpec struct { - SubnetTags map[string]string `json:"subnetTags,omitempty"` -} - // GCENetworkingSpec is the specification of GCE's native networking mode, using IP aliases type GCENetworkingSpec struct { } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index a1c28b8361..20fb5b4081 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -234,16 +234,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ClassicNetworkingSpec)(nil), (*kops.ClassicNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(a.(*ClassicNetworkingSpec), b.(*kops.ClassicNetworkingSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*kops.ClassicNetworkingSpec)(nil), (*ClassicNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec(a.(*kops.ClassicNetworkingSpec), b.(*ClassicNetworkingSpec), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*CloudConfiguration)(nil), (*kops.CloudConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_CloudConfiguration_To_kops_CloudConfiguration(a.(*CloudConfiguration), b.(*kops.CloudConfiguration), scope) }); err != nil { @@ -784,16 +774,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*LyftVPCNetworkingSpec)(nil), (*kops.LyftVPCNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec(a.(*LyftVPCNetworkingSpec), b.(*kops.LyftVPCNetworkingSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*kops.LyftVPCNetworkingSpec)(nil), (*LyftVPCNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec(a.(*kops.LyftVPCNetworkingSpec), b.(*LyftVPCNetworkingSpec), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*MetricsServerConfig)(nil), (*kops.MetricsServerConfig)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_MetricsServerConfig_To_kops_MetricsServerConfig(a.(*MetricsServerConfig), b.(*kops.MetricsServerConfig), scope) }); err != nil { @@ -974,16 +954,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*RomanaNetworkingSpec)(nil), (*kops.RomanaNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec(a.(*RomanaNetworkingSpec), b.(*kops.RomanaNetworkingSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*kops.RomanaNetworkingSpec)(nil), (*RomanaNetworkingSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec(a.(*kops.RomanaNetworkingSpec), b.(*RomanaNetworkingSpec), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*SSHCredential)(nil), (*kops.SSHCredential)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_SSHCredential_To_kops_SSHCredential(a.(*SSHCredential), b.(*kops.SSHCredential), scope) }); err != nil { @@ -1651,7 +1621,6 @@ func autoConvert_v1alpha3_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in * out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusProcessMetricsEnabled = in.PrometheusProcessMetricsEnabled - out.MajorVersion = in.MajorVersion out.TyphaPrometheusMetricsEnabled = in.TyphaPrometheusMetricsEnabled out.TyphaPrometheusMetricsPort = in.TyphaPrometheusMetricsPort out.TyphaReplicas = in.TyphaReplicas @@ -1687,7 +1656,6 @@ func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha3_CalicoNetworkingSpec(in * out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusProcessMetricsEnabled = in.PrometheusProcessMetricsEnabled - out.MajorVersion = in.MajorVersion out.TyphaPrometheusMetricsEnabled = in.TyphaPrometheusMetricsEnabled out.TyphaPrometheusMetricsPort = in.TyphaPrometheusMetricsPort out.TyphaReplicas = in.TyphaReplicas @@ -1706,7 +1674,6 @@ func autoConvert_v1alpha3_CanalNetworkingSpec_To_kops_CanalNetworkingSpec(in *Ca out.CPURequest = in.CPURequest out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DisableFlannelForwardRules = in.DisableFlannelForwardRules - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesBackend = in.IptablesBackend out.LogSeveritySys = in.LogSeveritySys out.MTU = in.MTU @@ -1730,7 +1697,6 @@ func autoConvert_kops_CanalNetworkingSpec_To_v1alpha3_CanalNetworkingSpec(in *ko out.CPURequest = in.CPURequest out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DisableFlannelForwardRules = in.DisableFlannelForwardRules - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesBackend = in.IptablesBackend out.LogSeveritySys = in.LogSeveritySys out.MTU = in.MTU @@ -1995,24 +1961,6 @@ func Convert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in *kops return autoConvert_kops_CiliumNetworkingSpec_To_v1alpha3_CiliumNetworkingSpec(in, out, s) } -func autoConvert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(in *ClassicNetworkingSpec, out *kops.ClassicNetworkingSpec, s conversion.Scope) error { - return nil -} - -// Convert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec is an autogenerated conversion function. -func Convert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(in *ClassicNetworkingSpec, out *kops.ClassicNetworkingSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(in, out, s) -} - -func autoConvert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec(in *kops.ClassicNetworkingSpec, out *ClassicNetworkingSpec, s conversion.Scope) error { - return nil -} - -// Convert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec is an autogenerated conversion function. -func Convert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec(in *kops.ClassicNetworkingSpec, out *ClassicNetworkingSpec, s conversion.Scope) error { - return autoConvert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec(in, out, s) -} - func autoConvert_v1alpha3_CloudConfiguration_To_kops_CloudConfiguration(in *CloudConfiguration, out *kops.CloudConfiguration, s conversion.Scope) error { out.ManageStorageClasses = in.ManageStorageClasses out.Multizone = in.Multizone @@ -3759,7 +3707,6 @@ func Convert_kops_FileAssetSpec_To_v1alpha3_FileAssetSpec(in *kops.FileAssetSpec func autoConvert_v1alpha3_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *FlannelNetworkingSpec, out *kops.FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } @@ -3771,7 +3718,6 @@ func Convert_v1alpha3_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *Fl func autoConvert_kops_FlannelNetworkingSpec_To_v1alpha3_FlannelNetworkingSpec(in *kops.FlannelNetworkingSpec, out *FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend - out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } @@ -5575,26 +5521,6 @@ func Convert_kops_LoadBalancerSubnetSpec_To_v1alpha3_LoadBalancerSubnetSpec(in * return autoConvert_kops_LoadBalancerSubnetSpec_To_v1alpha3_LoadBalancerSubnetSpec(in, out, s) } -func autoConvert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec(in *LyftVPCNetworkingSpec, out *kops.LyftVPCNetworkingSpec, s conversion.Scope) error { - out.SubnetTags = in.SubnetTags - return nil -} - -// Convert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec is an autogenerated conversion function. -func Convert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec(in *LyftVPCNetworkingSpec, out *kops.LyftVPCNetworkingSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec(in, out, s) -} - -func autoConvert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec(in *kops.LyftVPCNetworkingSpec, out *LyftVPCNetworkingSpec, s conversion.Scope) error { - out.SubnetTags = in.SubnetTags - return nil -} - -// Convert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec is an autogenerated conversion function. -func Convert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec(in *kops.LyftVPCNetworkingSpec, out *LyftVPCNetworkingSpec, s conversion.Scope) error { - return autoConvert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec(in, out, s) -} - func autoConvert_v1alpha3_MetricsServerConfig_To_kops_MetricsServerConfig(in *MetricsServerConfig, out *kops.MetricsServerConfig, s conversion.Scope) error { out.Enabled = in.Enabled out.Image = in.Image @@ -5670,15 +5596,7 @@ func Convert_kops_NTPConfig_To_v1alpha3_NTPConfig(in *kops.NTPConfig, out *NTPCo } func autoConvert_v1alpha3_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSpec, out *kops.NetworkingSpec, s conversion.Scope) error { - if in.Classic != nil { - in, out := &in.Classic, &out.Classic - *out = new(kops.ClassicNetworkingSpec) - if err := Convert_v1alpha3_ClassicNetworkingSpec_To_kops_ClassicNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.Classic = nil - } + out.Classic = in.Classic if in.Kubenet != nil { in, out := &in.Kubenet, &out.Kubenet *out = new(kops.KubenetNetworkingSpec) @@ -5760,15 +5678,7 @@ func autoConvert_v1alpha3_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.Kuberouter = nil } - if in.Romana != nil { - in, out := &in.Romana, &out.Romana - *out = new(kops.RomanaNetworkingSpec) - if err := Convert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.Romana = nil - } + out.Romana = in.Romana if in.AmazonVPC != nil { in, out := &in.AmazonVPC, &out.AmazonVPC *out = new(kops.AmazonVPCNetworkingSpec) @@ -5787,15 +5697,7 @@ func autoConvert_v1alpha3_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSp } else { out.Cilium = nil } - if in.LyftVPC != nil { - in, out := &in.LyftVPC, &out.LyftVPC - *out = new(kops.LyftVPCNetworkingSpec) - if err := Convert_v1alpha3_LyftVPCNetworkingSpec_To_kops_LyftVPCNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.LyftVPC = nil - } + out.LyftVPC = in.LyftVPC if in.GCE != nil { in, out := &in.GCE, &out.GCE *out = new(kops.GCENetworkingSpec) @@ -5814,15 +5716,7 @@ func Convert_v1alpha3_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSpec, } func autoConvert_kops_NetworkingSpec_To_v1alpha3_NetworkingSpec(in *kops.NetworkingSpec, out *NetworkingSpec, s conversion.Scope) error { - if in.Classic != nil { - in, out := &in.Classic, &out.Classic - *out = new(ClassicNetworkingSpec) - if err := Convert_kops_ClassicNetworkingSpec_To_v1alpha3_ClassicNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.Classic = nil - } + out.Classic = in.Classic if in.Kubenet != nil { in, out := &in.Kubenet, &out.Kubenet *out = new(KubenetNetworkingSpec) @@ -5904,15 +5798,7 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha3_NetworkingSpec(in *kops.Network } else { out.Kuberouter = nil } - if in.Romana != nil { - in, out := &in.Romana, &out.Romana - *out = new(RomanaNetworkingSpec) - if err := Convert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.Romana = nil - } + out.Romana = in.Romana if in.AmazonVPC != nil { in, out := &in.AmazonVPC, &out.AmazonVPC *out = new(AmazonVPCNetworkingSpec) @@ -5931,15 +5817,7 @@ func autoConvert_kops_NetworkingSpec_To_v1alpha3_NetworkingSpec(in *kops.Network } else { out.Cilium = nil } - if in.LyftVPC != nil { - in, out := &in.LyftVPC, &out.LyftVPC - *out = new(LyftVPCNetworkingSpec) - if err := Convert_kops_LyftVPCNetworkingSpec_To_v1alpha3_LyftVPCNetworkingSpec(*in, *out, s); err != nil { - return err - } - } else { - out.LyftVPC = nil - } + out.LyftVPC = in.LyftVPC if in.GCE != nil { in, out := &in.GCE, &out.GCE *out = new(GCENetworkingSpec) @@ -6427,28 +6305,6 @@ func Convert_kops_RollingUpdate_To_v1alpha3_RollingUpdate(in *kops.RollingUpdate return autoConvert_kops_RollingUpdate_To_v1alpha3_RollingUpdate(in, out, s) } -func autoConvert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec(in *RomanaNetworkingSpec, out *kops.RomanaNetworkingSpec, s conversion.Scope) error { - out.DaemonServiceIP = in.DaemonServiceIP - out.EtcdServiceIP = in.EtcdServiceIP - return nil -} - -// Convert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec is an autogenerated conversion function. -func Convert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec(in *RomanaNetworkingSpec, out *kops.RomanaNetworkingSpec, s conversion.Scope) error { - return autoConvert_v1alpha3_RomanaNetworkingSpec_To_kops_RomanaNetworkingSpec(in, out, s) -} - -func autoConvert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec(in *kops.RomanaNetworkingSpec, out *RomanaNetworkingSpec, s conversion.Scope) error { - out.DaemonServiceIP = in.DaemonServiceIP - out.EtcdServiceIP = in.EtcdServiceIP - return nil -} - -// Convert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec is an autogenerated conversion function. -func Convert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec(in *kops.RomanaNetworkingSpec, out *RomanaNetworkingSpec, s conversion.Scope) error { - return autoConvert_kops_RomanaNetworkingSpec_To_v1alpha3_RomanaNetworkingSpec(in, out, s) -} - func autoConvert_v1alpha3_SSHCredential_To_kops_SSHCredential(in *SSHCredential, out *kops.SSHCredential, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1alpha3_SSHCredentialSpec_To_kops_SSHCredentialSpec(&in.Spec, &out.Spec, s); err != nil { diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index 956ccc0fe6..805c7804f9 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -595,22 +595,6 @@ func (in *CiliumNetworkingSpec) DeepCopy() *CiliumNetworkingSpec { 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 - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClassicNetworkingSpec. -func (in *ClassicNetworkingSpec) DeepCopy() *ClassicNetworkingSpec { - if in == nil { - return nil - } - out := new(ClassicNetworkingSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) { *out = *in @@ -3746,29 +3730,6 @@ func (in *LoadBalancerSubnetSpec) DeepCopy() *LoadBalancerSubnetSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LyftVPCNetworkingSpec) DeepCopyInto(out *LyftVPCNetworkingSpec) { - *out = *in - if in.SubnetTags != nil { - in, out := &in.SubnetTags, &out.SubnetTags - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LyftVPCNetworkingSpec. -func (in *LyftVPCNetworkingSpec) DeepCopy() *LyftVPCNetworkingSpec { - if in == nil { - return nil - } - out := new(LyftVPCNetworkingSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MetricsServerConfig) DeepCopyInto(out *MetricsServerConfig) { *out = *in @@ -3872,7 +3833,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { *out = *in if in.Classic != nil { in, out := &in.Classic, &out.Classic - *out = new(ClassicNetworkingSpec) + *out = new(kops.ClassicNetworkingSpec) **out = **in } if in.Kubenet != nil { @@ -3922,7 +3883,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { } if in.Romana != nil { in, out := &in.Romana, &out.Romana - *out = new(RomanaNetworkingSpec) + *out = new(kops.RomanaNetworkingSpec) **out = **in } if in.AmazonVPC != nil { @@ -3937,7 +3898,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { } if in.LyftVPC != nil { in, out := &in.LyftVPC, &out.LyftVPC - *out = new(LyftVPCNetworkingSpec) + *out = new(kops.LyftVPCNetworkingSpec) (*in).DeepCopyInto(*out) } if in.GCE != nil { @@ -4484,22 +4445,6 @@ func (in *RollingUpdate) DeepCopy() *RollingUpdate { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RomanaNetworkingSpec) DeepCopyInto(out *RomanaNetworkingSpec) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RomanaNetworkingSpec. -func (in *RomanaNetworkingSpec) DeepCopy() *RomanaNetworkingSpec { - if in == nil { - return nil - } - out := new(RomanaNetworkingSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SSHCredential) DeepCopyInto(out *SSHCredential) { *out = *in