From 2929ebe7cc02431a8ccb25bc5b8fec2ecd8aba71 Mon Sep 17 00:00:00 2001 From: Richard Vanderpool <49568690+rvanderp3@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:21:08 -0400 Subject: [PATCH] provide clarification on the syntax of the IP address definition --- apis/v1alpha3/types.go | 3 ++- apis/v1alpha4/types.go | 3 ++- apis/v1beta1/types.go | 3 ++- ...ure.cluster.x-k8s.io_haproxyloadbalancers.yaml | 5 +++-- ...tructure.cluster.x-k8s.io_vspheremachines.yaml | 15 +++++++++------ ....cluster.x-k8s.io_vspheremachinetemplates.yaml | 14 ++++++++++---- ...nfrastructure.cluster.x-k8s.io_vspherevms.yaml | 15 +++++++++------ 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/apis/v1alpha3/types.go b/apis/v1alpha3/types.go index 477d4c30d5..a15661e154 100644 --- a/apis/v1alpha3/types.go +++ b/apis/v1alpha3/types.go @@ -237,7 +237,8 @@ type NetworkDeviceSpec struct { Gateway6 string `json:"gateway6,omitempty"` // IPAddrs is a list of one or more IPv4 and/or IPv6 addresses to assign - // to this device. + // to this device. IP addresses must also specify the segment length in + // CIDR notation. // Required when DHCP4 and DHCP6 are both false. // +optional IPAddrs []string `json:"ipAddrs,omitempty"` diff --git a/apis/v1alpha4/types.go b/apis/v1alpha4/types.go index 92dcdc349e..6b602689a7 100644 --- a/apis/v1alpha4/types.go +++ b/apis/v1alpha4/types.go @@ -237,7 +237,8 @@ type NetworkDeviceSpec struct { Gateway6 string `json:"gateway6,omitempty"` // IPAddrs is a list of one or more IPv4 and/or IPv6 addresses to assign - // to this device. + // to this device. IP addresses must also specify the segment length in + // CIDR notation. // Required when DHCP4 and DHCP6 are both false. // +optional IPAddrs []string `json:"ipAddrs,omitempty"` diff --git a/apis/v1beta1/types.go b/apis/v1beta1/types.go index 2d1c544c37..ae39ae9180 100644 --- a/apis/v1beta1/types.go +++ b/apis/v1beta1/types.go @@ -280,7 +280,8 @@ type NetworkDeviceSpec struct { Gateway6 string `json:"gateway6,omitempty"` // IPAddrs is a list of one or more IPv4 and/or IPv6 addresses to assign - // to this device. + // to this device. IP addresses must also specify the segment length in + // CIDR notation. // Required when DHCP4 and DHCP6 are both false. // +optional IPAddrs []string `json:"ipAddrs,omitempty"` diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml index 12300a313e..99207fe228 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml @@ -134,8 +134,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required - when DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml index 6ba5e7558a..b6c0e9d83e 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml @@ -138,8 +138,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array @@ -529,8 +530,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array @@ -929,8 +931,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml index e7cf08aa23..390d7ea95e 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml @@ -239,7 +239,9 @@ spec: ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or IPv6 addresses to assign to this device. - Required when DHCP4 and DHCP6 are both false. + IP addresses must also specify the segment length + in CIDR notation. Required when DHCP4 and DHCP6 + are both false. items: type: string type: array @@ -527,7 +529,9 @@ spec: ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or IPv6 addresses to assign to this device. - Required when DHCP4 and DHCP6 are both false. + IP addresses must also specify the segment length + in CIDR notation. Required when DHCP4 and DHCP6 + are both false. items: type: string type: array @@ -824,8 +828,10 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 - and/or IPv6 addresses to assign to this device. - Required when DHCP4 and DHCP6 are both false. + and/or IPv6 addresses to assign to this device. IP + addresses must also specify the segment length + in CIDR notation. Required when DHCP4 and DHCP6 + are both false. 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 9fa65de63e..3ca9d7f618 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 @@ -156,8 +156,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array @@ -566,8 +567,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array @@ -985,8 +987,9 @@ spec: type: string ipAddrs: description: IPAddrs is a list of one or more IPv4 and/or - IPv6 addresses to assign to this device. Required when - DHCP4 and DHCP6 are both false. + IPv6 addresses to assign to this device. IP addresses + must also specify the segment length in CIDR notation. + Required when DHCP4 and DHCP6 are both false. items: type: string type: array