From 605f3dd89a4bf706c8309db1b1ce49710cf8dbd5 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 27 Sep 2022 18:51:19 +0800 Subject: [PATCH] kubeadm: fix the field path of ClusterConfiguration networking validation --- cmd/kubeadm/app/apis/kubeadm/validation/validation.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index bf81e25c77b..c1588118761 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -512,21 +512,21 @@ func ValidateDNS(dns *kubeadm.DNS, fldPath *field.Path) field.ErrorList { // ValidateNetworking validates networking configuration func ValidateNetworking(c *kubeadm.ClusterConfiguration, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} - dnsDomainFldPath := field.NewPath("dnsDomain") + dnsDomainFldPath := fldPath.Child("dnsDomain") for _, err := range validation.IsDNS1123Subdomain(c.Networking.DNSDomain) { allErrs = append(allErrs, field.Invalid(dnsDomainFldPath, c.Networking.DNSDomain, err)) } if len(c.Networking.ServiceSubnet) != 0 { - allErrs = append(allErrs, ValidateIPNetFromString(c.Networking.ServiceSubnet, constants.MinimumAddressesInServiceSubnet, field.NewPath("serviceSubnet"))...) + allErrs = append(allErrs, ValidateIPNetFromString(c.Networking.ServiceSubnet, constants.MinimumAddressesInServiceSubnet, fldPath.Child("serviceSubnet"))...) // Service subnet was already validated, we need to validate now the subnet size - allErrs = append(allErrs, ValidateServiceSubnetSize(c.Networking.ServiceSubnet, field.NewPath("serviceSubnet"))...) + allErrs = append(allErrs, ValidateServiceSubnetSize(c.Networking.ServiceSubnet, fldPath.Child("serviceSubnet"))...) } if len(c.Networking.PodSubnet) != 0 { - allErrs = append(allErrs, ValidateIPNetFromString(c.Networking.PodSubnet, constants.MinimumAddressesInPodSubnet, field.NewPath("podSubnet"))...) + allErrs = append(allErrs, ValidateIPNetFromString(c.Networking.PodSubnet, constants.MinimumAddressesInPodSubnet, fldPath.Child("podSubnet"))...) if c.ControllerManager.ExtraArgs["allocate-node-cidrs"] != "false" { // Pod subnet was already validated, we need to validate now against the node-mask - allErrs = append(allErrs, ValidatePodSubnetNodeMask(c.Networking.PodSubnet, c, field.NewPath("podSubnet"))...) + allErrs = append(allErrs, ValidatePodSubnetNodeMask(c.Networking.PodSubnet, c, fldPath.Child("podSubnet"))...) } } return allErrs