github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

fix S1002 omit comp to bool

Browse Source 
Signed-off-by: Ken Sipe <kensipe@gmail.com>
This commit is contained in:
Ken Sipe 2020-06-26 10:36:38 -05:00
parent aadaa5d6a9
commit e8878687b1
No known key found for this signature in database
GPG Key ID: 564882A82432498D
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/authorization/union/union.go
View File

@ -29,6 +29,7 @@ import (
"strings" "strings"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"
) )
@ -88,7 +89,7 @@ func (authzHandler unionAuthzRulesHandler) RulesFor(user user.Info, namespace st
for _, currAuthzHandler := range authzHandler { for _, currAuthzHandler := range authzHandler {
resourceRules, nonResourceRules, incomplete, err := currAuthzHandler.RulesFor(user, namespace) resourceRules, nonResourceRules, incomplete, err := currAuthzHandler.RulesFor(user, namespace)
if incomplete == true { if incomplete {
incompleteStatus = true incompleteStatus = true
} }
if err != nil { if err != nil {

2
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go
View File

@ -141,7 +141,7 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope *RequestSc
// that will break existing clients. // that will break existing clients.
// Other cases where resource is not instantly deleted are: namespace deletion // Other cases where resource is not instantly deleted are: namespace deletion
// and pod graceful deletion. // and pod graceful deletion.
if !wasDeleted && options.OrphanDependents != nil && *options.OrphanDependents == false { if !wasDeleted && options.OrphanDependents != nil && !*options.OrphanDependents {
status = http.StatusAccepted status = http.StatusAccepted
} }
// if the rest.Deleter returns a nil object, fill out a status. Callers may return a valid // if the rest.Deleter returns a nil object, fill out a status. Callers may return a valid

2
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go
View File

@ -67,7 +67,7 @@ func (f *capManagersManager) capUpdateManagers(managed Managed) (newManaged Mana
// Gather all entries from updates // Gather all entries from updates
updaters := []string{} updaters := []string{}
for manager, fields := range managed.Fields() { for manager, fields := range managed.Fields() {
if fields.Applied() == false { if !fields.Applied() {
updaters = append(updaters, manager) updaters = append(updaters, manager)
} }
} }

2
staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go
View File

@ -1115,7 +1115,7 @@ func (t *Tester) testDeleteGracefulImmediate(obj runtime.Object, createFn Create
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
if wasDeleted != true { if !wasDeleted {
t.Errorf("unexpected, object %s should have been deleted immediately", objectMeta.GetName()) t.Errorf("unexpected, object %s should have been deleted immediately", objectMeta.GetName())
} }
_, err = t.storage.(rest.Getter).Get(ctx, objectMeta.GetName(), &metav1.GetOptions{}) _, err = t.storage.(rest.Getter).Get(ctx, objectMeta.GetName(), &metav1.GetOptions{})

6
staging/src/k8s.io/apiserver/pkg/server/egressselector/config.go
View File

@ -199,7 +199,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
return allErrs return allErrs
} }
if tlsConfig.CABundle != "" { if tlsConfig.CABundle != "" {
if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.CABundle); exists == false || err != nil { if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.CABundle); !exists || err != nil {
allErrs = append(allErrs, field.Invalid( allErrs = append(allErrs, field.Invalid(
fldPath.Child("tlsConfig", "caBundle"), fldPath.Child("tlsConfig", "caBundle"),
tlsConfig.CABundle, tlsConfig.CABundle,
@ -211,7 +211,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
fldPath.Child("tlsConfig", "clientCert"), fldPath.Child("tlsConfig", "clientCert"),
"nil", "nil",
"Using TLS requires clientCert")) "Using TLS requires clientCert"))
} else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientCert); exists == false || err != nil { } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientCert); !exists || err != nil {
allErrs = append(allErrs, field.Invalid( allErrs = append(allErrs, field.Invalid(
fldPath.Child("tlsConfig", "clientCert"), fldPath.Child("tlsConfig", "clientCert"),
tlsConfig.ClientCert, tlsConfig.ClientCert,
@ -222,7 +222,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
fldPath.Child("tlsConfig", "clientKey"), fldPath.Child("tlsConfig", "clientKey"),
"nil", "nil",
"Using TLS requires requires clientKey")) "Using TLS requires requires clientKey"))
} else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientKey); exists == false || err != nil { } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientKey); !exists || err != nil {
allErrs = append(allErrs, field.Invalid( allErrs = append(allErrs, field.Invalid(
fldPath.Child("tlsConfig", "clientKey"), fldPath.Child("tlsConfig", "clientKey"),
tlsConfig.ClientKey, tlsConfig.ClientKey,

3
staging/src/k8s.io/apiserver/pkg/server/options/egress_selector.go
View File

@ -18,6 +18,7 @@ package options
import ( import (
"fmt" "fmt"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/utils/path" "k8s.io/utils/path"
@ -84,7 +85,7 @@ func (o *EgressSelectorOptions) Validate() []error {
errs := []error{} errs := []error{}
if exists, err := path.Exists(path.CheckFollowSymlink, o.ConfigFile); exists == false || err != nil { if exists, err := path.Exists(path.CheckFollowSymlink, o.ConfigFile); !exists || err != nil {
errs = append(errs, fmt.Errorf("egress-selector-config-file %s does not exist", o.ConfigFile)) errs = append(errs, fmt.Errorf("egress-selector-config-file %s does not exist", o.ConfigFile))
} }