apply review changes from copilot

Signed-off-by: Mohammed Abdi <mohammed.munir.abdi@ibm.com>

Author: mamy-CS

Makefile

@@ -299,10 +299,12 @@ lint: golangci-lint ## Run golangci-lint linter
 	$(GOLANGCI_LINT) run
 
 .PHONY: lint-deploy-scripts
-lint-deploy-scripts: ## Run bash -n for deploy/install.sh and deploy/lib/*.sh
+lint-deploy-scripts: ## Run bash -n for deploy/install.sh, deploy/lib/*.sh, and deploy plugins
 	@echo "Syntax-checking deploy shell scripts..."
 	@bash -n deploy/install.sh
 	@for script in deploy/lib/*.sh; do bash -n "$$script"; done
+	@for script in deploy/*/install.sh; do if [ -f "$$script" ]; then bash -n "$$script"; fi; done
+	@for script in deploy/kind-emulator/*.sh; do if [ -f "$$script" ]; then bash -n "$$script"; fi; done
 	@echo "deploy script syntax OK"
 
 .PHONY: smoke-deploy-scripts

deploy/lib/cli.sh

@@ -102,7 +102,11 @@ parse_args() {
         fi
         ;;
       -h|--help)              print_help; exit 0 ;;
-      *)                      log_error "Unknown option: $1"; print_help; exit 1 ;;
+      *)
+        echo "Error: Unknown option: $1" >&2
+        print_help
+        exit 1
+        ;;
     esac
   done
 }

deploy/lib/install_core.sh

@@ -54,7 +54,7 @@ main() {
     set_tls_verification
     set_wva_logging_level
 
-    if [[ "$CLUSTER_TYPE" == "kind" ]]; then
+    if [[ "${CLUSTER_TYPE:-}" == "kind" ]]; then
         log_info "Kind cluster detected - setting environment to kind-emulated"
         ENVIRONMENT="kind-emulator"
     fi
@@ -65,9 +65,8 @@ main() {
         source "$SCRIPT_DIR/$ENVIRONMENT/install.sh"
 
         # Run environment-specific prerequisite checks if function exists
-        if declare -f check_prerequisites > /dev/null; then
+        if declare -f check_specific_prerequisites > /dev/null; then
             if [ "$SKIP_CHECKS" != "true" ]; then
-                check_prerequisites
                 check_specific_prerequisites
             fi
         fi

test/e2e/fixtures/inference_objective.go

@@ -3,6 +3,9 @@ package fixtures
 import (
 	"context"
 	"fmt"
+	"os"
+	"reflect"
+	"strings"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -25,11 +28,38 @@ var inferenceObjectiveGVR = schema.GroupVersionResource{
 // Returns applied=true if the object exists or was created. If the InferenceObjective API is not
 // available on the cluster, returns (false, nil).
 func EnsureInferenceObjective(ctx context.Context, dc dynamic.Interface, namespace, poolName string) (applied bool, err error) {
-	obj := buildInferenceObjective(namespace, poolName)
 	ri := dc.Resource(inferenceObjectiveGVR).Namespace(namespace)
+	poolGroup, gErr := resolveInferencePoolGroup(ctx, dc, namespace, poolName)
+	if gErr != nil {
+		return false, gErr
+	}
+	obj := buildInferenceObjective(namespace, poolName, poolGroup)
 
 	if _, cErr := ri.Create(ctx, obj, metav1.CreateOptions{}); cErr != nil {
 		if apierrors.IsAlreadyExists(cErr) {
+			current, getErr := ri.Get(ctx, "e2e-default", metav1.GetOptions{})
+			if getErr != nil {
+				return false, fmt.Errorf("get existing InferenceObjective e2e-default: %w", getErr)
+			}
+
+			currentSpec, _, specErr := unstructured.NestedMap(current.Object, "spec")
+			if specErr != nil {
+				return false, fmt.Errorf("read existing InferenceObjective spec: %w", specErr)
+			}
+			desiredSpec, _, desiredErr := unstructured.NestedMap(obj.Object, "spec")
+			if desiredErr != nil {
+				return false, fmt.Errorf("read desired InferenceObjective spec: %w", desiredErr)
+			}
+			if reflect.DeepEqual(currentSpec, desiredSpec) {
+				return true, nil
+			}
+
+			if setErr := unstructured.SetNestedMap(current.Object, desiredSpec, "spec"); setErr != nil {
+				return false, fmt.Errorf("set desired InferenceObjective spec: %w", setErr)
+			}
+			if _, uErr := ri.Update(ctx, current, metav1.UpdateOptions{}); uErr != nil {
+				return false, fmt.Errorf("update InferenceObjective e2e-default: %w", uErr)
+			}
 			return true, nil
 		}
 		if inferenceObjectiveAPIMissing(cErr) {
@@ -49,7 +79,7 @@ func DeleteInferenceObjective(ctx context.Context, dc dynamic.Interface, namespa
 	return err
 }
 
-func buildInferenceObjective(namespace, poolName string) *unstructured.Unstructured {
+func buildInferenceObjective(namespace, poolName, poolGroup string) *unstructured.Unstructured {
 	return &unstructured.Unstructured{
 		Object: map[string]interface{}{
 			"apiVersion": "inference.networking.x-k8s.io/v1alpha2",
@@ -63,7 +93,7 @@ func buildInferenceObjective(namespace, poolName string) *unstructured.Unstructu
 				"poolRef": map[string]interface{}{
 					"name":  poolName,
 					"kind":  "InferencePool",
-					"group": "inference.networking.k8s.io",
+					"group": poolGroup,
 				},
 			},
 		},
@@ -77,9 +107,44 @@ func inferenceObjectiveAPIMissing(err error) bool {
 	if meta.IsNoMatchError(err) {
 		return true
 	}
-	if apierrors.IsNotFound(err) {
+	se, ok := err.(*apierrors.StatusError)
+	if !ok {
+		return false
+	}
+	if se.ErrStatus.Reason != metav1.StatusReasonNotFound {
+		return false
+	}
+	if strings.Contains(strings.ToLower(se.ErrStatus.Message), "the server could not find the requested resource") {
 		return true
 	}
-	// Discovery / dynamic client sometimes returns ResourceNotFound with Reason NotFound
-	return apierrors.ReasonForError(err) == metav1.StatusReasonNotFound
+	details := se.ErrStatus.Details
+	if details == nil {
+		return false
+	}
+	return details.Group == inferenceObjectiveGVR.Group && details.Kind == inferenceObjectiveGVR.Resource
+}
+
+func resolveInferencePoolGroup(ctx context.Context, dc dynamic.Interface, namespace, poolName string) (string, error) {
+	if envPoolGroup := os.Getenv("POOL_GROUP"); envPoolGroup != "" {
+		return envPoolGroup, nil
+	}
+
+	inferencePoolCandidates := []schema.GroupVersionResource{
+		{Group: "inference.networking.k8s.io", Version: "v1", Resource: "inferencepools"},
+		{Group: "inference.networking.x-k8s.io", Version: "v1alpha2", Resource: "inferencepools"},
+	}
+
+	for _, gvr := range inferencePoolCandidates {
+		_, err := dc.Resource(gvr).Namespace(namespace).Get(ctx, poolName, metav1.GetOptions{})
+		if err == nil {
+			return gvr.Group, nil
+		}
+		if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+			continue
+		}
+		return "", fmt.Errorf("detect InferencePool API group for %q: %w", poolName, err)
+	}
+
+	// Default to the primary group used by llm-d charts.
+	return "inference.networking.k8s.io", nil
 }