From ecc3fa8753b8047810f567b49a501aaf27ee537c Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Fri, 30 Jun 2023 14:09:07 -0300 Subject: [PATCH] Add generated files --- apis/v1alpha3/zz_generated.conversion.go | 74 +++---- apis/v1alpha3/zz_generated.deepcopy.go | 25 --- apis/v1alpha4/zz_generated.conversion.go | 74 +++---- apis/v1alpha4/zz_generated.deepcopy.go | 25 --- apis/v1beta1/zz_generated.deepcopy.go | 42 +++- ...luster.x-k8s.io_vspherefailuredomains.yaml | 180 +++++++++++++++++- ...structure.cluster.x-k8s.io_vspherevms.yaml | 2 - 7 files changed, 272 insertions(+), 150 deletions(-) diff --git a/apis/v1alpha3/zz_generated.conversion.go b/apis/v1alpha3/zz_generated.conversion.go index 87e728ee2a..3dc8c8873c 100644 --- a/apis/v1alpha3/zz_generated.conversion.go +++ b/apis/v1alpha3/zz_generated.conversion.go @@ -80,16 +80,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Network)(nil), (*v1beta1.Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha3_Network_To_v1beta1_Network(a.(*Network), b.(*v1beta1.Network), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta1.Network)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Network_To_v1alpha3_Network(a.(*v1beta1.Network), b.(*Network), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*NetworkDeviceSpec)(nil), (*v1beta1.NetworkDeviceSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_NetworkDeviceSpec_To_v1beta1_NetworkDeviceSpec(a.(*NetworkDeviceSpec), b.(*v1beta1.NetworkDeviceSpec), scope) }); err != nil { @@ -150,11 +140,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.Topology)(nil), (*Topology)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Topology_To_v1alpha3_Topology(a.(*v1beta1.Topology), b.(*Topology), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*VSphereCluster)(nil), (*v1beta1.VSphereCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha3_VSphereCluster_To_v1beta1_VSphereCluster(a.(*VSphereCluster), b.(*v1beta1.VSphereCluster), scope) }); err != nil { @@ -450,6 +435,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1beta1.Topology)(nil), (*Topology)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Topology_To_v1alpha3_Topology(a.(*v1beta1.Topology), b.(*Topology), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta1.VSphereClusterSpec)(nil), (*VSphereClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(a.(*v1beta1.VSphereClusterSpec), b.(*VSphereClusterSpec), scope) }); err != nil { @@ -563,30 +553,6 @@ func Convert_v1beta1_FailureDomainHosts_To_v1alpha3_FailureDomainHosts(in *v1bet return autoConvert_v1beta1_FailureDomainHosts_To_v1alpha3_FailureDomainHosts(in, out, s) } -func autoConvert_v1alpha3_Network_To_v1beta1_Network(in *Network, out *v1beta1.Network, s conversion.Scope) error { - out.Name = in.Name - out.DHCP4 = (*bool)(unsafe.Pointer(in.DHCP4)) - out.DHCP6 = (*bool)(unsafe.Pointer(in.DHCP6)) - return nil -} - -// Convert_v1alpha3_Network_To_v1beta1_Network is an autogenerated conversion function. -func Convert_v1alpha3_Network_To_v1beta1_Network(in *Network, out *v1beta1.Network, s conversion.Scope) error { - return autoConvert_v1alpha3_Network_To_v1beta1_Network(in, out, s) -} - -func autoConvert_v1beta1_Network_To_v1alpha3_Network(in *v1beta1.Network, out *Network, s conversion.Scope) error { - out.Name = in.Name - out.DHCP4 = (*bool)(unsafe.Pointer(in.DHCP4)) - out.DHCP6 = (*bool)(unsafe.Pointer(in.DHCP6)) - return nil -} - -// Convert_v1beta1_Network_To_v1alpha3_Network is an autogenerated conversion function. -func Convert_v1beta1_Network_To_v1alpha3_Network(in *v1beta1.Network, out *Network, s conversion.Scope) error { - return autoConvert_v1beta1_Network_To_v1alpha3_Network(in, out, s) -} - func autoConvert_v1alpha3_NetworkDeviceSpec_To_v1beta1_NetworkDeviceSpec(in *NetworkDeviceSpec, out *v1beta1.NetworkDeviceSpec, s conversion.Scope) error { out.NetworkName = in.NetworkName out.DeviceName = in.DeviceName @@ -784,15 +750,11 @@ func autoConvert_v1beta1_Topology_To_v1alpha3_Topology(in *v1beta1.Topology, out out.ComputeCluster = (*string)(unsafe.Pointer(in.ComputeCluster)) out.Hosts = (*FailureDomainHosts)(unsafe.Pointer(in.Hosts)) out.Networks = *(*[]string)(unsafe.Pointer(&in.Networks)) + // WARNING: in.NetworkConfigs requires manual conversion: does not exist in peer-type out.Datastore = in.Datastore return nil } -// Convert_v1beta1_Topology_To_v1alpha3_Topology is an autogenerated conversion function. -func Convert_v1beta1_Topology_To_v1alpha3_Topology(in *v1beta1.Topology, out *Topology, s conversion.Scope) error { - return autoConvert_v1beta1_Topology_To_v1alpha3_Topology(in, out, s) -} - func autoConvert_v1alpha3_VSphereCluster_To_v1beta1_VSphereCluster(in *VSphereCluster, out *v1beta1.VSphereCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1alpha3_VSphereClusterSpec_To_v1beta1_VSphereClusterSpec(&in.Spec, &out.Spec, s); err != nil { @@ -1144,7 +1106,17 @@ func Convert_v1beta1_VSphereFailureDomain_To_v1alpha3_VSphereFailureDomain(in *v func autoConvert_v1alpha3_VSphereFailureDomainList_To_v1beta1_VSphereFailureDomainList(in *VSphereFailureDomainList, out *v1beta1.VSphereFailureDomainList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]v1beta1.VSphereFailureDomain)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta1.VSphereFailureDomain, len(*in)) + for i := range *in { + if err := Convert_v1alpha3_VSphereFailureDomain_To_v1beta1_VSphereFailureDomain(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } @@ -1155,7 +1127,17 @@ func Convert_v1alpha3_VSphereFailureDomainList_To_v1beta1_VSphereFailureDomainLi func autoConvert_v1beta1_VSphereFailureDomainList_To_v1alpha3_VSphereFailureDomainList(in *v1beta1.VSphereFailureDomainList, out *VSphereFailureDomainList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]VSphereFailureDomain)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]VSphereFailureDomain, len(*in)) + for i := range *in { + if err := Convert_v1beta1_VSphereFailureDomain_To_v1alpha3_VSphereFailureDomain(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } diff --git a/apis/v1alpha3/zz_generated.deepcopy.go b/apis/v1alpha3/zz_generated.deepcopy.go index f636240d4c..8e187869a9 100644 --- a/apis/v1alpha3/zz_generated.deepcopy.go +++ b/apis/v1alpha3/zz_generated.deepcopy.go @@ -374,31 +374,6 @@ func (in *HAProxyLoadBalancerStatus) DeepCopy() *HAProxyLoadBalancerStatus { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Network) DeepCopyInto(out *Network) { - *out = *in - if in.DHCP4 != nil { - in, out := &in.DHCP4, &out.DHCP4 - *out = new(bool) - **out = **in - } - if in.DHCP6 != nil { - in, out := &in.DHCP6, &out.DHCP6 - *out = new(bool) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Network. -func (in *Network) DeepCopy() *Network { - if in == nil { - return nil - } - out := new(Network) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NetworkDeviceSpec) DeepCopyInto(out *NetworkDeviceSpec) { *out = *in diff --git a/apis/v1alpha4/zz_generated.conversion.go b/apis/v1alpha4/zz_generated.conversion.go index a401c23933..839535ae94 100644 --- a/apis/v1alpha4/zz_generated.conversion.go +++ b/apis/v1alpha4/zz_generated.conversion.go @@ -80,16 +80,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Network)(nil), (*v1beta1.Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha4_Network_To_v1beta1_Network(a.(*Network), b.(*v1beta1.Network), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*v1beta1.Network)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Network_To_v1alpha4_Network(a.(*v1beta1.Network), b.(*Network), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*NetworkDeviceSpec)(nil), (*v1beta1.NetworkDeviceSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha4_NetworkDeviceSpec_To_v1beta1_NetworkDeviceSpec(a.(*NetworkDeviceSpec), b.(*v1beta1.NetworkDeviceSpec), scope) }); err != nil { @@ -150,11 +140,6 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1beta1.Topology)(nil), (*Topology)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_Topology_To_v1alpha4_Topology(a.(*v1beta1.Topology), b.(*Topology), scope) - }); err != nil { - return err - } if err := s.AddGeneratedConversionFunc((*VSphereCluster)(nil), (*v1beta1.VSphereCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1alpha4_VSphereCluster_To_v1beta1_VSphereCluster(a.(*VSphereCluster), b.(*v1beta1.VSphereCluster), scope) }); err != nil { @@ -490,6 +475,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*v1beta1.Topology)(nil), (*Topology)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Topology_To_v1alpha4_Topology(a.(*v1beta1.Topology), b.(*Topology), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*v1beta1.VSphereClusterSpec)(nil), (*VSphereClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1beta1_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec(a.(*v1beta1.VSphereClusterSpec), b.(*VSphereClusterSpec), scope) }); err != nil { @@ -603,30 +593,6 @@ func Convert_v1beta1_FailureDomainHosts_To_v1alpha4_FailureDomainHosts(in *v1bet return autoConvert_v1beta1_FailureDomainHosts_To_v1alpha4_FailureDomainHosts(in, out, s) } -func autoConvert_v1alpha4_Network_To_v1beta1_Network(in *Network, out *v1beta1.Network, s conversion.Scope) error { - out.Name = in.Name - out.DHCP4 = (*bool)(unsafe.Pointer(in.DHCP4)) - out.DHCP6 = (*bool)(unsafe.Pointer(in.DHCP6)) - return nil -} - -// Convert_v1alpha4_Network_To_v1beta1_Network is an autogenerated conversion function. -func Convert_v1alpha4_Network_To_v1beta1_Network(in *Network, out *v1beta1.Network, s conversion.Scope) error { - return autoConvert_v1alpha4_Network_To_v1beta1_Network(in, out, s) -} - -func autoConvert_v1beta1_Network_To_v1alpha4_Network(in *v1beta1.Network, out *Network, s conversion.Scope) error { - out.Name = in.Name - out.DHCP4 = (*bool)(unsafe.Pointer(in.DHCP4)) - out.DHCP6 = (*bool)(unsafe.Pointer(in.DHCP6)) - return nil -} - -// Convert_v1beta1_Network_To_v1alpha4_Network is an autogenerated conversion function. -func Convert_v1beta1_Network_To_v1alpha4_Network(in *v1beta1.Network, out *Network, s conversion.Scope) error { - return autoConvert_v1beta1_Network_To_v1alpha4_Network(in, out, s) -} - func autoConvert_v1alpha4_NetworkDeviceSpec_To_v1beta1_NetworkDeviceSpec(in *NetworkDeviceSpec, out *v1beta1.NetworkDeviceSpec, s conversion.Scope) error { out.NetworkName = in.NetworkName out.DeviceName = in.DeviceName @@ -824,15 +790,11 @@ func autoConvert_v1beta1_Topology_To_v1alpha4_Topology(in *v1beta1.Topology, out out.ComputeCluster = (*string)(unsafe.Pointer(in.ComputeCluster)) out.Hosts = (*FailureDomainHosts)(unsafe.Pointer(in.Hosts)) out.Networks = *(*[]string)(unsafe.Pointer(&in.Networks)) + // WARNING: in.NetworkConfigs requires manual conversion: does not exist in peer-type out.Datastore = in.Datastore return nil } -// Convert_v1beta1_Topology_To_v1alpha4_Topology is an autogenerated conversion function. -func Convert_v1beta1_Topology_To_v1alpha4_Topology(in *v1beta1.Topology, out *Topology, s conversion.Scope) error { - return autoConvert_v1beta1_Topology_To_v1alpha4_Topology(in, out, s) -} - func autoConvert_v1alpha4_VSphereCluster_To_v1beta1_VSphereCluster(in *VSphereCluster, out *v1beta1.VSphereCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1alpha4_VSphereClusterSpec_To_v1beta1_VSphereClusterSpec(&in.Spec, &out.Spec, s); err != nil { @@ -1302,7 +1264,17 @@ func Convert_v1beta1_VSphereFailureDomain_To_v1alpha4_VSphereFailureDomain(in *v func autoConvert_v1alpha4_VSphereFailureDomainList_To_v1beta1_VSphereFailureDomainList(in *VSphereFailureDomainList, out *v1beta1.VSphereFailureDomainList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]v1beta1.VSphereFailureDomain)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]v1beta1.VSphereFailureDomain, len(*in)) + for i := range *in { + if err := Convert_v1alpha4_VSphereFailureDomain_To_v1beta1_VSphereFailureDomain(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } @@ -1313,7 +1285,17 @@ func Convert_v1alpha4_VSphereFailureDomainList_To_v1beta1_VSphereFailureDomainLi func autoConvert_v1beta1_VSphereFailureDomainList_To_v1alpha4_VSphereFailureDomainList(in *v1beta1.VSphereFailureDomainList, out *VSphereFailureDomainList, s conversion.Scope) error { out.ListMeta = in.ListMeta - out.Items = *(*[]VSphereFailureDomain)(unsafe.Pointer(&in.Items)) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]VSphereFailureDomain, len(*in)) + for i := range *in { + if err := Convert_v1beta1_VSphereFailureDomain_To_v1alpha4_VSphereFailureDomain(&(*in)[i], &(*out)[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } return nil } diff --git a/apis/v1alpha4/zz_generated.deepcopy.go b/apis/v1alpha4/zz_generated.deepcopy.go index 6bff4b58f7..d080d62f8e 100644 --- a/apis/v1alpha4/zz_generated.deepcopy.go +++ b/apis/v1alpha4/zz_generated.deepcopy.go @@ -94,31 +94,6 @@ func (in *FailureDomainHosts) DeepCopy() *FailureDomainHosts { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Network) DeepCopyInto(out *Network) { - *out = *in - if in.DHCP4 != nil { - in, out := &in.DHCP4, &out.DHCP4 - *out = new(bool) - **out = **in - } - if in.DHCP6 != nil { - in, out := &in.DHCP6, &out.DHCP6 - *out = new(bool) - **out = **in - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Network. -func (in *Network) DeepCopy() *Network { - if in == nil { - return nil - } - out := new(Network) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NetworkDeviceSpec) DeepCopyInto(out *NetworkDeviceSpec) { *out = *in diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index 0b1928995f..86c2fc7768 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -171,7 +171,7 @@ func (in *FailureDomainHosts) DeepCopy() *FailureDomainHosts { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Network) DeepCopyInto(out *Network) { +func (in *FailureDomainNetwork) DeepCopyInto(out *FailureDomainNetwork) { *out = *in if in.DHCP4 != nil { in, out := &in.DHCP4, &out.DHCP4 @@ -183,14 +183,41 @@ func (in *Network) DeepCopyInto(out *Network) { *out = new(bool) **out = **in } + if in.Nameservers != nil { + in, out := &in.Nameservers, &out.Nameservers + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.SearchDomains != nil { + in, out := &in.SearchDomains, &out.SearchDomains + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.DHCP4Overrides != nil { + in, out := &in.DHCP4Overrides, &out.DHCP4Overrides + *out = new(DHCPOverrides) + (*in).DeepCopyInto(*out) + } + if in.DHCP6Overrides != nil { + in, out := &in.DHCP6Overrides, &out.DHCP6Overrides + *out = new(DHCPOverrides) + (*in).DeepCopyInto(*out) + } + if in.AddressesFromPools != nil { + in, out := &in.AddressesFromPools, &out.AddressesFromPools + *out = make([]v1.TypedLocalObjectReference, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Network. -func (in *Network) DeepCopy() *Network { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FailureDomainNetwork. +func (in *FailureDomainNetwork) DeepCopy() *FailureDomainNetwork { if in == nil { return nil } - out := new(Network) + out := new(FailureDomainNetwork) in.DeepCopyInto(out) return out } @@ -392,6 +419,13 @@ func (in *Topology) DeepCopyInto(out *Topology) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.NetworkConfigs != nil { + in, out := &in.NetworkConfigs, &out.NetworkConfigs + *out = make([]FailureDomainNetwork, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Topology. diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml index 4e894a5c2b..ec37adac6c 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml @@ -334,9 +334,185 @@ spec: - hostGroupName - vmGroupName type: object + networkConfigs: + description: NetworkConfigs is a list with new network configurations + within this failure domain + items: + description: FailureDomainNetwork defines a network configuration + that should be used when consuming this failure domain. @rkatz + - To be discussed with team, should we just embed NetworkDeviceSpec? + properties: + addressesFromPools: + description: AddressesFromPools is a list of IPAddressPools + that should be assigned to IPAddressClaims. The machine's + cloud-init metadata will be populated with IPAddresses + fulfilled by an IPAM provider. + items: + description: TypedLocalObjectReference contains enough + information to let you locate the typed referenced object + inside the same namespace. + properties: + apiGroup: + description: APIGroup is the group for the resource + being referenced. If APIGroup is not specified, + the specified Kind must be in the core API group. + For any other third-party types, APIGroup is required. + type: string + kind: + description: Kind is the type of resource being referenced + type: string + name: + description: Name is the name of resource being referenced + type: string + required: + - apiGroup + - kind + - name + type: object + type: array + dhcp4: + description: '@rkatz - The reason NetworkDeviceSpec is not + being copied here, is because DHCP4 and DHCP6 are not + pointers there This means that, in a case like "I want + DHCP4 to be enabled on my template" and "I want DHCP4 + to be disabled on this failure domain" we cannot verify + if DHCP4 was unset (nil, we don''t care about it on failure + domain) vs set to false (I want to FORCE it to be false) + DHCP4 is a flag that indicates whether or not to use DHCP + for IPv4' + type: boolean + dhcp4Overrides: + description: DHCP4Overrides allows for the control over + several DHCP behaviors. Overrides will only be applied + when the corresponding DHCP flag is set. Only configured + values will be sent, omitted values will default to distribution + defaults. Dependent on support in the network stack for + your distribution. For more information see the netplan + reference (https://netplan.io/reference#dhcp-overrides) + properties: + hostname: + description: Hostname is the name which will be sent + to the DHCP server instead of the machine's hostname. + type: string + routeMetric: + description: RouteMetric is used to prioritize routes + for devices. A lower metric for an interface will + have a higher priority. + type: integer + sendHostname: + description: SendHostname when `true`, the hostname + of the machine will be sent to the DHCP server. + type: boolean + useDNS: + description: UseDNS when `true`, the DNS servers in + the DHCP server will be used and take precedence. + type: boolean + useDomains: + description: UseDomains can take the values `true`, + `false`, or `route`. When `true`, the domain name + from the DHCP server will be used as the DNS search + domain for this device. When `route`, the domain name + from the DHCP response will be used for routing DNS + only, not for searching. + type: string + useHostname: + description: UseHostname when `true`, the hostname from + the DHCP server will be set as the transient hostname + of the machine. + type: boolean + useMTU: + description: UseMTU when `true`, the MTU from the DHCP + server will be set as the MTU of the device. + type: boolean + useNTP: + description: UseNTP when `true`, the NTP servers from + the DHCP server will be used by systemd-timesyncd + and take precedence. + type: boolean + useRoutes: + description: UseRoutes when `true`, the routes from + the DHCP server will be installed in the routing table. + type: string + type: object + dhcp6: + description: DHCP6 indicates whether or not to use DHCP + for IPv6 + type: boolean + dhcp6Overrides: + description: DHCP6Overrides allows for the control over + several DHCP behaviors. Overrides will only be applied + when the corresponding DHCP flag is set. Only configured + values will be sent, omitted values will default to distribution + defaults. Dependent on support in the network stack for + your distribution. For more information see the netplan + reference (https://netplan.io/reference#dhcp-overrides) + properties: + hostname: + description: Hostname is the name which will be sent + to the DHCP server instead of the machine's hostname. + type: string + routeMetric: + description: RouteMetric is used to prioritize routes + for devices. A lower metric for an interface will + have a higher priority. + type: integer + sendHostname: + description: SendHostname when `true`, the hostname + of the machine will be sent to the DHCP server. + type: boolean + useDNS: + description: UseDNS when `true`, the DNS servers in + the DHCP server will be used and take precedence. + type: boolean + useDomains: + description: UseDomains can take the values `true`, + `false`, or `route`. When `true`, the domain name + from the DHCP server will be used as the DNS search + domain for this device. When `route`, the domain name + from the DHCP response will be used for routing DNS + only, not for searching. + type: string + useHostname: + description: UseHostname when `true`, the hostname from + the DHCP server will be set as the transient hostname + of the machine. + type: boolean + useMTU: + description: UseMTU when `true`, the MTU from the DHCP + server will be set as the MTU of the device. + type: boolean + useNTP: + description: UseNTP when `true`, the NTP servers from + the DHCP server will be used by systemd-timesyncd + and take precedence. + type: boolean + useRoutes: + description: UseRoutes when `true`, the routes from + the DHCP server will be installed in the routing table. + type: string + type: object + name: + description: NetworkName is the network name for this machine's + VM. + type: string + nameservers: + description: Nameservers is a list of IPv4 and/or IPv6 addresses + used as DNS nameservers. Please note that Linux allows + only three nameservers (https://linux.die.net/man/5/resolv.conf). + items: + type: string + type: array + searchDomains: + description: SearchDomains is a list of search domains used + when resolving IP addresses with DNS. + items: + type: string + type: array + type: object + type: array networks: - description: Networks is the list of networks within this failure - domain + description: 'Networks is the list of networks within this failure + domain TODO (@rkatz): Deprecate in favor of NetworkConfigs?' items: type: string type: array diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml index ed8ec68c54..fd44fa6251 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml @@ -8,8 +8,6 @@ metadata: spec: group: infrastructure.cluster.x-k8s.io names: - categories: - - cluster-api kind: VSphereVM listKind: VSphereVMList plural: vspherevms