Merge pull request #92547 from kensipe/apiservier-staticchecks-bools

fix Apiserver staticchecks for bools

staging/src/k8s.io/apiserver/pkg/authorization/union/union.go

@@ -88,7 +88,7 @@ func (authzHandler unionAuthzRulesHandler) RulesFor(user user.Info, namespace st
 	for _, currAuthzHandler := range authzHandler {
 		resourceRules, nonResourceRules, incomplete, err := currAuthzHandler.RulesFor(user, namespace)
 
-		if incomplete == true {
+		if incomplete {
 			incompleteStatus = true
 		}
 		if err != nil {

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

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

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

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

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go

@@ -683,10 +683,7 @@ func shouldOrphanDependents(ctx context.Context, e *Store, accessor metav1.Objec
 	}
 
 	// Get default orphan policy from this REST object type if it exists
-	if defaultGCPolicy == rest.OrphanDependents {
+	return defaultGCPolicy == rest.OrphanDependents
-		return true
-	}
-	return false
 }
 
 // shouldDeleteDependents returns true if the finalizer for foreground deletion should be set

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

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

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

@@ -199,7 +199,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
 		return allErrs
 	}
 	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(
 				fldPath.Child("tlsConfig", "caBundle"),
 				tlsConfig.CABundle,
@@ -211,7 +211,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
 			fldPath.Child("tlsConfig", "clientCert"),
 			"nil",
 			"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(
 			fldPath.Child("tlsConfig", "clientCert"),
 			tlsConfig.ClientCert,
@@ -222,7 +222,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel
 			fldPath.Child("tlsConfig", "clientKey"),
 			"nil",
 			"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(
 			fldPath.Child("tlsConfig", "clientKey"),
 			tlsConfig.ClientKey,

staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go

@@ -80,9 +80,5 @@ type probabilisticGoawayDecider struct {
 
 // Goaway implement GoawayDecider
 func (p *probabilisticGoawayDecider) Goaway(r *http.Request) bool {
-	if p.next() < p.chance {
+	return p.next() < p.chance
-		return true
-	}
-
-	return false
 }

staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go

@@ -113,17 +113,15 @@ func TestClientReceivedGOAWAY(t *testing.T) {
 
 		count := 0
 		for {
-			select {
+			<-timer.C
-			case <-timer.C:
+			n, err := w.Write([]byte("w"))
-				n, err := w.Write([]byte("w"))
+			if err != nil {
-				if err != nil {
+				return
-					return
+			}
-				}
+			flusher.Flush()
-				flusher.Flush()
+			count += n
-				count += n
+			if count == watchExpectSendBytes {
-				if count == watchExpectSendBytes {
+				return
-					return
-				}
 			}
 		}
 	})

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

@@ -18,6 +18,7 @@ package options
 
 import (
 	"fmt"
+
 	"github.com/spf13/pflag"
 	"k8s.io/utils/path"
 
@@ -84,7 +85,7 @@ func (o *EgressSelectorOptions) Validate() []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))
 	}
 

staging/src/k8s.io/apiserver/pkg/server/storage/resource_config.go

@@ -85,11 +85,7 @@ func (o *ResourceConfig) EnableVersions(versions ...schema.GroupVersion) {
 
 func (o *ResourceConfig) VersionEnabled(version schema.GroupVersion) bool {
 	enabled, _ := o.GroupVersionConfigs[version]
-	if enabled {
+	return enabled
-		return true
-	}
-
-	return false
 }
 
 func (o *ResourceConfig) DisableResources(resources ...schema.GroupVersionResource) {

staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go

@@ -348,9 +348,7 @@ func ClockWait(clk *testclock.FakeEventClock, counter counter.GoRoutineCounter,
 		close(dunch)
 	}, duration)
 	counter.Add(-1)
-	select {
+	<-dunch
-	case <-dunch:
-	}
 }
 
 func init() {

staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go

@@ -51,10 +51,8 @@ type RealEventClock struct {
 func (RealEventClock) EventAfterDuration(f EventFunc, d time.Duration) {
 	ch := time.After(d)
 	go func() {
-		select {
+		t := <-ch
-		case t := <-ch:
+		f(t)
-			f(t)
-		}
 	}()
 }