From 063e64c4ec2f2afc6b8372a31a6a45432df2d40f Mon Sep 17 00:00:00 2001 From: shawnhanx Date: Sat, 13 Nov 2021 17:02:40 +0800 Subject: [PATCH] fix S1017 and S1002 in pkg/apis/core/validation/validation.go --- pkg/apis/core/validation/validation.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 707674bd64e..e5cc07e9483 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -3179,9 +3179,7 @@ func validatePodDNSConfig(dnsConfig *core.PodDNSConfig, dnsPolicy *core.DNSPolic } for i, search := range dnsConfig.Searches { // it is fine to have a trailing dot - if strings.HasSuffix(search, ".") { - search = search[0 : len(search)-1] - } + search = strings.TrimSuffix(search, ".") allErrs = append(allErrs, ValidateDNS1123Subdomain(search, fldPath.Child("searches").Index(i))...) } // Validate options. @@ -6320,7 +6318,7 @@ func validateWindowsHostProcessPod(podSpec *core.PodSpec, fieldPath *field.Path, } // At present Windows Pods which contain HostProcess containers must also set HostNetwork. - if hostNetwork != true { + if !hostNetwork { errMsg := "hostNetwork must be true if pod contains any hostProcess containers" allErrs = append(allErrs, field.Invalid(fieldPath.Child("hostNetwork"), hostNetwork, errMsg)) }