address some review comments

Signed-off-by: Lionel Villard <[email protected]>

Author: lionelvillard

Makefile

@@ -18,8 +18,11 @@ SIDECAR_IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(SIDECAR_IMAGE_NAME)
 SIDECAR_IMG = $(SIDECAR_IMAGE_TAG_BASE):$(SIDECAR_TAG)
 NAMESPACE ?= hc4ai-operator
 
-ACTIVATOR_IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(PROJECT_NAME)-activator
-ACTIVATOR_IMG = $(ACTIVATOR_IMAGE_TAG_BASE):$(EPP_TAG)
+ACTIVATOR_IMAGE_NAME ?= llm-d-activator
+ACTIVATOR_NAME ?= activator
+ACTIVATOR_TAG ?= dev
+ACTIVATOR_IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(ACTIVATOR_IMAGE_NAME)
+ACTIVATOR_IMG = $(ACTIVATOR_IMAGE_TAG_BASE):$(ACTIVATOR_TAG)
 
 # Map go arch to typos arch
 ifeq ($(TARGETARCH),amd64)
@@ -57,10 +60,13 @@ SRC = $(shell find . -type f -name '*.go')
 # Internal variables for generic targets
 epp_IMAGE = $(IMG)
 sidecar_IMAGE = $(SIDECAR_IMG)
+activator_IMAGE = $(ACTIVATOR_IMG)
 epp_NAME = epp
 sidecar_NAME = $(SIDECAR_NAME)
+activator_NAME = $(ACTIVATOR_NAME)
 epp_LDFLAGS = -ldflags="$(LDFLAGS)"
 sidecar_LDFLAGS =
+activator_LDFLAGS = -ldflags="$(LDFLAGS)"
 epp_TEST_FILES = go list ./... | grep -v /test/ | grep -v ./pkg/sidecar/
 sidecar_TEST_FILES = go list ./pkg/sidecar/...
 
@@ -133,25 +139,17 @@ lint: check-golangci-lint check-typos ## Run lint
 ##@ Build
 
 .PHONY: build
-build: build-epp build-sidecar ## Build the project
+build: build-epp build-sidecar build-activator ## Build the project
 
 .PHONY: build-%
 build-%: check-go install-dependencies download-tokenizer ## Build the project
 	@printf "\033[33;1m==== Building ====\033[0m\n"
 	go build $($*_LDFLAGS) -o bin/$($*_NAME) cmd/$($*_NAME)/main.go
 
-##@ Build Activator
-
-.PHONY: activator-build
-activator-build: check-go install-dependencies download-tokenizer ## Build the project
-	@printf "\033[33;1m==== Building ====\033[0m\n"
-	go build -ldflags="$(LDFLAGS)" -o bin/activator cmd/activator/main.go
-
-
 ##@ Container Build/Push
 
 .PHONY:	image-build
-image-build: image-build-epp image-build-sidecar ## Build Docker image
+image-build: image-build-epp image-build-sidecar image-build-activator ## Build Docker image
 
 .PHONY:	image-build-%
 image-build-%: check-container-tool ## Build Docker image ## Build Docker image using $(CONTAINER_TOOL)
@@ -165,29 +163,13 @@ image-build-%: check-container-tool ## Build Docker image ## Build Docker image
  		-t $($*_IMAGE) -f Dockerfile.$* .
 
 .PHONY: image-push
-image-push: image-push-epp image-push-sidecar ## Push Docker images to registry
+image-push: image-push-epp image-push-sidecar image-push-activator ## Push Docker images to registry
 
 .PHONY: image-push-%
 image-push-%: check-container-tool load-version-json ## Push Docker image to registry
 	@printf "\033[33;1m==== Pushing Docker image $($*_IMAGE) ====\033[0m\n"
 	$(CONTAINER_TOOL) push $($*_IMAGE)
 
-.PHONY: activator-image-build
-activator-image-build: ## Build the activator image using Docker Buildx.
-	$(CONTAINER_TOOL) build \
-		--platform linux/$(TARGETARCH) \
-		--build-arg TARGETOS=linux \
-		--build-arg TARGETARCH=${TARGETARCH} \
-		--build-arg COMMIT_SHA=${GIT_COMMIT_SHA} \
-		--build-arg BUILD_REF=${BUILD_REF} \
-		 -t $(ACTIVATOR_IMG) \
-		 -f Dockerfile.activator .
-
-.PHONY: activator-image-push
-activator-image-push: check-container-tool load-version-json ## Push Activator Docker image $(ACTIVATOR_IMG) to registry
-	@printf "\033[33;1m==== Pushing Activator Docker image $(ACTIVATOR_IMG) ====\033[0m\n"
-	$(CONTAINER_TOOL) push $(ACTIVATOR_IMG)
-
 ##@ Install/Uninstall Targets
 
 # Default install/uninstall (Docker)

charts/activator/README.md

@@ -36,7 +36,7 @@ The following table list the configurable parameters of the chart.
 | `activator.image.pullPolicy`       | Image pull policy for the container. Possible values: `Always`, `IfNotPresent`, or `Never`. Defaults to `Always`. |
 | `inferenceGateway.port`            | The port of the Gateway. Defaults to `80`.    |
 | `inferencePool.name`               | The name of the InferencePool to target.  |
-| `inferencePool.apiVersion`         | The API version of the InferencePool. Defaults to `inference.networking.x-k8s.io`.  |
+| `inferencePool.apiVersion`         | The API version of the InferencePool. Defaults to `inference.networking.k8s.io`.  |
 | `route.name`                       | The name of the HTTPRoute to attach the activator to.  |
 
 ## Notes

charts/activator/values.yaml

@@ -13,7 +13,7 @@ route:
 
 inferencePool:
   name: inference-pool
-  group: inference.networking.x-k8s.io
+  group: inference.networking.k8s.io
 
 inferenceGateway:
   port: 80

pkg/activator/requestcontrol/activator.go

@@ -10,6 +10,7 @@ import (
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/dynamic"
@@ -179,14 +180,16 @@ func (a *Activator) inferencePoolPodsReady(logger logr.Logger, namespace, objnam
 		}
 
 		// NOTE: this assumes that the target object has a status.readyReplicas field
-		if readyReplicas, ok := unstructuredObj.Object["status"].(map[string]any)["readyReplicas"].(int64); ok {
-			if numReplicas == int32(readyReplicas) {
+		if readyReplicas, found, err := unstructured.NestedFieldNoCopy(unstructuredObj.Object, "status", "readyReplicas"); found {
+			if numReplicas == int32(readyReplicas.(int64)) {
 				logger.V(logutil.DEBUG).Info("Candidate pods are READY")
 				return true, nil
 			}
 			logger.V(logutil.DEBUG).Info("Candidate pods are NOT READY")
+		} else if err != nil {
+			logger.Error(err, "Error getting readyReplicas - candidate pods for serving the request are NOT READY")
 		} else {
-			logger.V(logutil.DEBUG).Info("Object status.readyReplicas field is not set yet - candidate pods for serving the request are NOT READY ")
+			logger.V(logutil.DEBUG).Info("Object status.readyReplicas field is not set yet - candidate pods for serving the request are NOT READY")
 			return false, nil
 		}