remove struct duplication from linodego now that opinters are used everywhere so deepcopy generation works properly

Author: AshleyDumaine

api/v1beta1/linodecluster_types.go

@@ -252,7 +252,7 @@ type NodeBalancerConfig struct {
 }
 
 type LinodeNBPortConfig struct {
-	// port configured on the NodeBalancer. It must be valid port range (1-65535).
+	// Port configured on the NodeBalancer. It must be valid port range (1-65535).
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=65535
 	// +required

api/v1beta1/linodemachine_types.go

@@ -173,15 +173,15 @@ type LinodeMachineSpec struct {
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	// +listType=atomic
-	Interfaces []InstanceConfigInterfaceCreateOptions `json:"interfaces,omitempty"`
+	Interfaces []linodego.InstanceConfigInterfaceCreateOptions `json:"interfaces,omitempty"`
 
 	// LinodeInterfaces is a list of Linode network interfaces to use for the instance. Requires Linode Interfaces beta opt-in to use.
 	// Conflicts with Interfaces.
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	// +kubebuilder:object:generate=true
 	// +listType=atomic
-	LinodeInterfaces []LinodeInterfaceCreateOptions `json:"linodeInterfaces,omitempty"`
+	LinodeInterfaces []linodego.LinodeInterfaceCreateOptions `json:"linodeInterfaces,omitempty"`
 
 	// diskEncryption determines if the disks of the instance should be encrypted. The default is disabled.
 	// +optional
@@ -268,235 +268,6 @@ type InstanceMetadataOptions struct {
 	UserData string `json:"userData,omitempty"`
 }
 
-// InstanceConfigInterfaceCreateOptions defines network interface config
-type InstanceConfigInterfaceCreateOptions struct {
-	// ipamAddress is the IP address to assign to the interface.
-	// +optional
-	IPAMAddress string `json:"ipamAddress,omitempty"`
-
-	// label is the label of the interface.
-	// +kubebuilder:validation:MinLength=3
-	// +kubebuilder:validation:MaxLength=63
-	// +optional
-	Label string `json:"label,omitempty"`
-
-	// purpose is the purpose of the interface.
-	// +optional
-	Purpose linodego.ConfigInterfacePurpose `json:"purpose,omitempty"`
-
-	// primary is a boolean indicating whether the interface is primary.
-	// +optional
-	Primary bool `json:"primary,omitempty"`
-
-	// subnetId is the ID of the subnet to use for the interface.
-	// +optional
-	SubnetID *int `json:"subnetId,omitempty"`
-
-	// ipv4 is the IPv4 configuration for the interface.
-	// +optional
-	IPv4 *VPCIPv4 `json:"ipv4,omitempty"`
-
-	// ipRanges is a list of IPv4 ranges to assign to the interface.
-	// +optional
-	// +listType=set
-	IPRanges []string `json:"ipRanges,omitempty"`
-}
-
-// LinodeInterfaceCreateOptions defines the linode network interface config
-type LinodeInterfaceCreateOptions struct {
-	// firewallID is the ID of the firewall to use for the interface.
-	// +optional
-	FirewallID *int `json:"firewallID,omitempty"`
-
-	// defaultRoute is the default route for the interface.
-	// +optional
-	DefaultRoute *InterfaceDefaultRoute `json:"defaultRoute,omitempty"`
-
-	// public is the public interface configuration for the interface.
-	// +optional
-	Public *PublicInterfaceCreateOptions `json:"public,omitempty"`
-
-	// vpc is the VPC interface configuration for the interface.
-	// +optional
-	VPC *VPCInterfaceCreateOptions `json:"vpc,omitempty"`
-
-	// vlan is the VLAN interface configuration for the interface.
-	// +optional
-	VLAN *VLANInterface `json:"vlan,omitempty"`
-}
-
-// InterfaceDefaultRoute defines the default IPv4 and IPv6 routes for an interface
-type InterfaceDefaultRoute struct {
-	// ipv4 is the IPv4 default route for the interface.
-	// +optional
-	IPv4 *bool `json:"ipv4,omitempty"`
-
-	// ipv6 is the IPv6 default route for the interface.
-	// +optional
-	IPv6 *bool `json:"ipv6,omitempty"`
-}
-
-// PublicInterfaceCreateOptions defines the IPv4 and IPv6 public interface create options
-type PublicInterfaceCreateOptions struct {
-	// ipv4 is the IPv4 configuration for the public interface.
-	// +optional
-	IPv4 *PublicInterfaceIPv4CreateOptions `json:"ipv4,omitempty"`
-
-	// ipv6 is the IPv6 configuration for the public interface.
-	// +optional
-	IPv6 *PublicInterfaceIPv6CreateOptions `json:"ipv6,omitempty"`
-}
-
-// PublicInterfaceIPv4CreateOptions defines the PublicInterfaceIPv4AddressCreateOptions for addresses
-type PublicInterfaceIPv4CreateOptions struct {
-	// addresses is the IPv4 addresses for the public interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=address
-	Addresses []PublicInterfaceIPv4AddressCreateOptions `json:"addresses,omitempty"`
-}
-
-// PublicInterfaceIPv4AddressCreateOptions defines the public IPv4 address and whether it is primary
-type PublicInterfaceIPv4AddressCreateOptions struct {
-	// address is the IPv4 address for the public interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Address string `json:"address,omitempty"`
-
-	// primary is a boolean indicating whether the address is primary.
-	// +optional
-	Primary *bool `json:"primary,omitempty"`
-}
-
-// PublicInterfaceIPv6CreateOptions defines the PublicInterfaceIPv6RangeCreateOptions
-type PublicInterfaceIPv6CreateOptions struct {
-	// ranges is the IPv6 ranges for the public interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=range
-	Ranges []PublicInterfaceIPv6RangeCreateOptions `json:"ranges,omitempty"`
-}
-
-// PublicInterfaceIPv6RangeCreateOptions defines the IPv6 range for a public interface
-type PublicInterfaceIPv6RangeCreateOptions struct {
-	// range is the IPv6 range for the public interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Range string `json:"range,omitempty"`
-}
-
-// VPCInterfaceCreateOptions defines the VPC interface configuration for an instance
-type VPCInterfaceCreateOptions struct {
-	// subnetId is the ID of the subnet to use for the interface.
-	// +optional
-	SubnetID *int `json:"subnetId,omitempty"`
-
-	// ipv4 is the IPv4 configuration for the interface.
-	// +optional
-	IPv4 *VPCInterfaceIPv4CreateOptions `json:"ipv4,omitempty"`
-
-	// ipv6 is the IPv6 configuration for the interface.
-	// +optional
-	IPv6 *VPCInterfaceIPv6CreateOptions `json:"ipv6,omitempty"`
-}
-
-// VPCInterfaceIPv6CreateOptions defines the IPv6 configuration for a VPC interface
-type VPCInterfaceIPv6CreateOptions struct {
-	// slaac is the IPv6 SLAAC configuration for the interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=range
-	SLAAC []VPCInterfaceIPv6SLAACCreateOptions `json:"slaac,omitempty"`
-
-	// ranges is the IPv6 ranges for the interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=range
-	Ranges []VPCInterfaceIPv6RangeCreateOptions `json:"ranges,omitempty"`
-
-	// isPublic is a boolean indicating whether the interface is public.
-	// +required
-	IsPublic *bool `json:"isPublic,omitempty"`
-}
-
-// VPCInterfaceIPv6SLAACCreateOptions defines the Range for IPv6 SLAAC
-type VPCInterfaceIPv6SLAACCreateOptions struct {
-	// range is the IPv6 range for the interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Range string `json:"range,omitempty"`
-}
-
-// VPCInterfaceIPv6RangeCreateOptions defines the IPv6 range for a VPC interface
-type VPCInterfaceIPv6RangeCreateOptions struct {
-	// range is the IPv6 range for the interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Range string `json:"range,omitempty"`
-}
-
-// VPCInterfaceIPv4CreateOptions defines the IPv4 address and range configuration for a VPC interface
-type VPCInterfaceIPv4CreateOptions struct {
-	// addresses is the IPv4 addresses for the interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=address
-	Addresses []VPCInterfaceIPv4AddressCreateOptions `json:"addresses,omitempty"`
-
-	// ranges is the IPv4 ranges for the interface.
-	// +optional
-	// +listType=map
-	// +listMapKey=range
-	Ranges []VPCInterfaceIPv4RangeCreateOptions `json:"ranges,omitempty"`
-}
-
-// VPCInterfaceIPv4AddressCreateOptions defines the IPv4 configuration for a VPC interface
-type VPCInterfaceIPv4AddressCreateOptions struct {
-	// address is the IPv4 address for the interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Address string `json:"address,omitempty"`
-
-	// primary is a boolean indicating whether the address is primary.
-	// +optional
-	Primary *bool `json:"primary,omitempty"`
-
-	// nat1to1Address is the NAT 1:1 address for the interface.
-	// +optional
-	NAT1To1Address *string `json:"nat1to1Address,omitempty"`
-}
-
-// VPCInterfaceIPv4RangeCreateOptions defines the IPv4 range for a VPC interface
-type VPCInterfaceIPv4RangeCreateOptions struct {
-	// range is the IPv4 range for the interface.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	Range string `json:"range,omitempty"`
-}
-
-// VLANInterface defines the VLAN interface configuration for an instance
-type VLANInterface struct {
-	// vlanLabel is the label of the VLAN.
-	// +kubebuilder:validation:MinLength=1
-	// +required
-	VLANLabel string `json:"vlanLabel,omitempty"`
-
-	// ipamAddress is the IP address to assign to the interface.
-	// +optional
-	IPAMAddress *string `json:"ipamAddress,omitempty"`
-}
-
-// VPCIPv4 defines VPC IPV4 settings
-type VPCIPv4 struct {
-	// vpc is the ID of the VPC to use for the interface.
-	// +optional
-	VPC string `json:"vpc,omitempty"`
-
-	// nat1to1 is the NAT 1:1 address for the interface.
-	// +optional
-	NAT1To1 string `json:"nat1to1,omitempty"`
-}
-
 // LinodeMachineStatus defines the observed state of LinodeMachine
 type LinodeMachineStatus struct {
 	// conditions define the current service state of the LinodeMachine.