From e8f69398c351ddf70bdc61ac6252489be63dd9ef Mon Sep 17 00:00:00 2001 From: sanwishe Date: Fri, 21 May 2021 14:38:31 +0800 Subject: [PATCH] simplify return boolean value expression in cmd/kube-controller-manager/app/certificates.go --- .../app/certificates.go | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/cmd/kube-controller-manager/app/certificates.go b/cmd/kube-controller-manager/app/certificates.go index 6ea8945fc73..ab269aca236 100644 --- a/cmd/kube-controller-manager/app/certificates.go +++ b/cmd/kube-controller-manager/app/certificates.go @@ -96,34 +96,22 @@ func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error } func areKubeletServingSignerFilesSpecified(config csrsigningconfig.CSRSigningControllerConfiguration) bool { - if len(config.KubeletServingSignerConfiguration.CertFile) > 0 || len(config.KubeletServingSignerConfiguration.KeyFile) > 0 { - // if only one is specified, it will error later during construction - return true - } - return false + // if only one is specified, it will error later during construction + return len(config.KubeletServingSignerConfiguration.CertFile) > 0 || len(config.KubeletServingSignerConfiguration.KeyFile) > 0 } func areKubeletClientSignerFilesSpecified(config csrsigningconfig.CSRSigningControllerConfiguration) bool { - if len(config.KubeletClientSignerConfiguration.CertFile) > 0 || len(config.KubeletClientSignerConfiguration.KeyFile) > 0 { - // if only one is specified, it will error later during construction - return true - } - return false + // if only one is specified, it will error later during construction + return len(config.KubeletClientSignerConfiguration.CertFile) > 0 || len(config.KubeletClientSignerConfiguration.KeyFile) > 0 } func areKubeAPIServerClientSignerFilesSpecified(config csrsigningconfig.CSRSigningControllerConfiguration) bool { - if len(config.KubeAPIServerClientSignerConfiguration.CertFile) > 0 || len(config.KubeAPIServerClientSignerConfiguration.KeyFile) > 0 { - // if only one is specified, it will error later during construction - return true - } - return false + // if only one is specified, it will error later during construction + return len(config.KubeAPIServerClientSignerConfiguration.CertFile) > 0 || len(config.KubeAPIServerClientSignerConfiguration.KeyFile) > 0 } func areLegacyUnknownSignerFilesSpecified(config csrsigningconfig.CSRSigningControllerConfiguration) bool { - if len(config.LegacyUnknownSignerConfiguration.CertFile) > 0 || len(config.LegacyUnknownSignerConfiguration.KeyFile) > 0 { - // if only one is specified, it will error later during construction - return true - } - return false + // if only one is specified, it will error later during construction + return len(config.LegacyUnknownSignerConfiguration.CertFile) > 0 || len(config.LegacyUnknownSignerConfiguration.KeyFile) > 0 } func anySpecificFilesSet(config csrsigningconfig.CSRSigningControllerConfiguration) bool {