Resolve pre-commit linting errors

  - Remove unused context assignment in config_merge_test.go
  - Fix empty branch in scheduler.go with explicit error ignore
  - Remove unnecessary string conversions for Condition types
  - Fix error handling in deleteAlpha2* functions to properly check IsNotFound
  - Auto-format code with go fmt (config_merge.go, openapi_generated.go)

Signed-off-by: Killian Golds <[email protected]>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

Author: KillianGolds

pkg/controller/llmisvc/config_merge.go

@@ -144,28 +144,28 @@ func (r *LLMInferenceServiceReconciler) combineBaseRefsConfig(ctx context.Contex
 	}
 
 	if llmSvcCfg.Spec.Router != nil &&
-	llmSvcCfg.Spec.Router.Scheduler != nil &&
-	llmSvcCfg.Spec.Router.Scheduler.Pool != nil &&
-	llmSvcCfg.Spec.Router.Scheduler.Pool.Spec != nil {
-	// Start with any existing matchLabels (typed in v1).
-	dst := make(map[igwv1.LabelKey]igwv1.LabelValue, len(llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector.MatchLabels))
-	for k, v := range llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector.MatchLabels {
-		dst[k] = v
-	}
+		llmSvcCfg.Spec.Router.Scheduler != nil &&
+		llmSvcCfg.Spec.Router.Scheduler.Pool != nil &&
+		llmSvcCfg.Spec.Router.Scheduler.Pool.Spec != nil {
+		// Start with any existing matchLabels (typed in v1).
+		dst := make(map[igwv1.LabelKey]igwv1.LabelValue, len(llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector.MatchLabels))
+		for k, v := range llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector.MatchLabels {
+			dst[k] = v
+		}
 
-	// Merge in the controller's workload labels (plain strings) as typed keys/values.
-	// GetWorkloadLabelSelector returns map[string]string.
-	if extra := GetWorkloadLabelSelector(llmSvc.ObjectMeta, &llmSvcCfg.Spec); len(extra) > 0 {
-		for k, v := range extra {
-			dst[igwv1.LabelKey(k)] = igwv1.LabelValue(v)
+		// Merge in the controller's workload labels (plain strings) as typed keys/values.
+		// GetWorkloadLabelSelector returns map[string]string.
+		if extra := GetWorkloadLabelSelector(llmSvc.ObjectMeta, &llmSvcCfg.Spec); len(extra) > 0 {
+			for k, v := range extra {
+				dst[igwv1.LabelKey(k)] = igwv1.LabelValue(v)
+			}
 		}
-	}
 
-	// v1 uses igwv1.LabelSelector{ MatchLabels map[LabelKey]LabelValue } (typed), not map[string]string.
-	llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector = igwv1.LabelSelector{
-		MatchLabels: dst,
+		// v1 uses igwv1.LabelSelector{ MatchLabels map[LabelKey]LabelValue } (typed), not map[string]string.
+		llmSvcCfg.Spec.Router.Scheduler.Pool.Spec.Selector = igwv1.LabelSelector{
+			MatchLabels: dst,
+		}
 	}
-}
 
 	if llmSvcCfg.Spec.Router != nil &&
 		llmSvcCfg.Spec.Router.Scheduler != nil &&

pkg/controller/llmisvc/config_merge_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/yaml"
 
 	ktesting "github.com/kserve/kserve/pkg/testing"
@@ -37,7 +36,6 @@ import (
 	gatewayapi "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
-	pkgtest "github.com/kserve/kserve/pkg/testing"
 )
 
 func TestMergeSpecs(t *testing.T) {
@@ -1310,9 +1308,7 @@ func TestMergeSpecs(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := t.Context()
-			ctx = log.IntoContext(ctx, pkgtest.NewTestLogger(t))
-
+			// Remove unused context assignment - MergeSpecs doesn't need context
 			got, err := llmisvc.MergeSpecs(tt.cfgs...)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("MergeSpecs() error = %v, wantErr %v", err, tt.wantErr)

pkg/controller/llmisvc/scheduler.go

@@ -187,12 +187,12 @@ func (r *LLMInferenceServiceReconciler) reconcileSchedulerInferencePool(ctx cont
 
 	// Fetch current v1 to read Status (expected has no Status).
 	cur := &igwv1.InferencePool{}
-	if err := r.Client.Get(ctx, crclient.ObjectKey{
+	// Intentionally ignore error - if v1 pool doesn't exist or can't be fetched,
+	// cur remains empty and isV1PoolReady will return false, allowing fallback to alpha2
+	_ = r.Client.Get(ctx, crclient.ObjectKey{
 		Namespace: expected.Namespace,
-		Name: expected.Name,
-	}, cur); err != nil {
-		// If we can't fetch v1, treat v1 as not ready and rely on alpha2 below.
-	}
+		Name:      expected.Name,
+	}, cur)
 
 	v1Ready := isV1PoolReady(cur)
 	alpha2Ready := r.isAlpha2PoolReady(ctx, llmSvc.GetNamespace(), expected.GetName())
@@ -662,10 +662,11 @@ func isV1PoolReady(p *igwv1.InferencePool) bool {
 	for _, ps := range p.Status.Parents {
 		accepted, resolved := false, false
 		for _, c := range ps.Conditions {
-			if string(c.Type) == "Accepted" && string(c.Status) == "True" {
+			// c.Type is string, c.Status is ConditionStatus (string alias) - no conversion needed
+			if c.Type == "Accepted" && c.Status == "True" {
 				accepted = true
 			}
-			if string(c.Type) == "ResolvedRefs" && string(c.Status) == "True" {
+			if c.Type == "ResolvedRefs" && c.Status == "True" {
 				resolved = true
 			}
 		}
@@ -935,7 +936,12 @@ func (r *LLMInferenceServiceReconciler) deleteAlpha2PoolIfExists(ctx context.Con
 	res := r.DynamicClient.Resource(GVRInferencePoolV1Alpha2).Namespace(llmSvc.Namespace)
 	_, err := res.Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
-		return nil // nothing to delete or not found
+		// If resource doesn't exist (NotFound), that's fine - nothing to delete
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		// For other errors, propagate them
+		return err
 	}
 	return res.Delete(ctx, name, metav1.DeleteOptions{})
 }
@@ -945,7 +951,12 @@ func (r *LLMInferenceServiceReconciler) deleteAlpha2InferenceModelIfExists(ctx c
 	res := r.DynamicClient.Resource(GVRInferenceModelV1Alpha2).Namespace(llmSvc.Namespace)
 	_, err := res.Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
-		return nil // not found or not installed so ignore
+		// If resource doesn't exist (NotFound) or CRD not installed, that's fine
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		// For other errors, propagate them
+		return err
 	}
 	return res.Delete(ctx, name, metav1.DeleteOptions{})
 }