From 26cd33662e28f12a23681bd5a3d209b164eae562 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 b827b11d28..9667804f91 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 b5323d4844..9eba7f6d6c 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 2c668715bc..5793366f84 100644 --- a/apis/v1beta1/types.go +++ b/apis/v1beta1/types.go @@ -313,7 +313,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 cb9c775472..3f6ad86ce9 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 @@ -132,8 +132,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 0107e33aa0..bf748de52a 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 @@ -140,8 +140,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 @@ -535,8 +536,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 @@ -1085,8 +1087,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 0c68d2ad8a..643bf2a5df 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 @@ -241,7 +241,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 @@ -529,7 +531,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 @@ -988,8 +992,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 31d8acd304..5832e0e039 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 @@ -157,8 +157,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 @@ -568,8 +569,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 @@ -1134,8 +1136,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