Merge pull request #102200 from sanwishe/simplifyboolexpr

simplify return boolean value expression
This commit is contained in:
Kubernetes Prow Robot 2021-05-26 13:46:11 -07:00 committed by GitHub
commit 2117d85c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 {