update: code review

- move image tags from Makefile.tools.mk back to Makefile.mk
- update docuement to reflact how image and tag are created
- do not export image tag env variables
- fix patch-deployments.yaml after EPP_TAG is not used but should only
  use EPP_IMAGE
- fix kubernetes-dev-env.sh for EPP_IMAGE
- remove flag on golangci_lint fmt

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

Author: zdtsw

DEVELOPMENT.md

@@ -227,9 +227,9 @@ curl -s -w '\n' http://localhost:8080/v1/completions -H 'Content-Type: applicati
 
 #### Environment Configurateion
 
-**1. Setting the EPP image and tag:**
+**1. Setting the EPP image registry and tag:**
 
-You can optionally set a custom EPP image and tag (otherwise, defaults will be used):
+You can optionally set a custom image registry and tag (otherwise, defaults will be used):
 
 ```bash
 export IMAGE_REGISTRY="<YOUR_REGISTRY>"

Makefile

@@ -21,15 +21,14 @@ SIDECAR_NAME ?= pd-sidecar
 IMAGE_REGISTRY ?= ghcr.io/llm-d
 IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(PROJECT_NAME)
 EPP_TAG ?= dev
-export EPP_TAG
 export EPP_IMAGE ?= $(IMAGE_TAG_BASE):$(EPP_TAG)
 SIDECAR_TAG ?= dev
-export SIDECAR_TAG
 SIDECAR_IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(SIDECAR_IMAGE_NAME)
 export SIDECAR_IMAGE ?= $(SIDECAR_IMAGE_TAG_BASE):$(SIDECAR_TAG)
-NAMESPACE ?= hc4ai-operator
+VLLM_SIMULATOR_TAG ?= v0.6.1
 VLLM_SIMULATOR_TAG_BASE ?= $(IMAGE_REGISTRY)/$(VLLM_SIMULATOR_IMAGE_NAME)
 export VLLM_SIMULATOR_IMAGE ?= $(VLLM_SIMULATOR_TAG_BASE):$(VLLM_SIMULATOR_TAG)
+NAMESPACE ?= hc4ai-operator
 
 # Map go arch to platform-specific arch
 ifeq ($(TARGETOS),darwin)
@@ -132,7 +131,7 @@ clean: ## Clean build artifacts, tools and caches
 format: check-golangci-lint ## Format Go source files
 	@printf "\033[33;1m==== Running go fmt ====\033[0m\n"
 	@gofmt -l -w $(SRC)
-	$(GOLANGCI_LINT) fmt --fix
+	$(GOLANGCI_LINT) fmt
 
 .PHONY: lint
 lint: check-golangci-lint check-typos ## Run lint

Makefile.kind.mk

@@ -13,11 +13,8 @@ env-dev-kind: image-build ## Run under kind ($(KIND_CLUSTER_NAME))
 		GATEWAY_HOST_PORT=$(KIND_GATEWAY_HOST_PORT) \
 		IMAGE_REGISTRY=$(IMAGE_REGISTRY) \
 		EPP_IMAGE=$(EPP_IMAGE) \
-		EPP_TAG=$(EPP_TAG) \
 		VLLM_SIMULATOR_IMAGE=${VLLM_SIMULATOR_IMAGE} \
-		VLLM_SIMULATOR_TAG=$(VLLM_SIMULATOR_TAG) \
 		SIDECAR_IMAGE=$(SIDECAR_IMAGE) \
-		SIDECAR_TAG=$(SIDECAR_TAG) \
 		./scripts/kind-dev-env.sh; \
 	fi
 

Makefile.tools.mk

@@ -18,8 +18,6 @@ GINKGO_VERSION ?= v2.27.2
 GOLANGCI_LINT_VERSION ?= v2.1.6
 KUSTOMIZE_VERSION ?= v5.5.0
 TYPOS_VERSION ?= v1.34.0
-VLLM_SIMULATOR_TAG ?= v0.6.1
-export VLLM_SIMULATOR_TAG
 
 ## Python Configuration
 PYTHON_VERSION ?= 3.12

deploy/environments/dev/kubernetes-kgateway/patch-deployments.yaml

@@ -7,7 +7,7 @@ spec:
     spec:
       containers:
       - name: epp
-        image: ${EPP_IMAGE}:${EPP_TAG}
+        image: ${EPP_IMAGE}
         imagePullPolicy: Always
         args:
         - --pool-name

scripts/kubernetes-dev-env.sh

@@ -71,12 +71,12 @@ export POOL_NAME="${POOL_NAME:-${MODEL_NAME_SAFE}-inference-pool}"
 # Endpoint Picker (EPP) deployment name
 export EPP_NAME="${EPP_NAME:-${MODEL_NAME_SAFE}-endpoint-picker}"
 
-# EPP container image name
-export EPP_IMAGE="${EPP_IMAGE:-${IMAGE_REGISTRY}/llm-d-inference-scheduler}"
-
 # EPP image tag
 export EPP_TAG="${EPP_TAG:-v0.1.0}"
 
+# EPP container image (full reference including tag)
+export EPP_IMAGE="${EPP_IMAGE:-${IMAGE_REGISTRY}/llm-d-inference-scheduler:${EPP_TAG}}"
+
 # Whether P/D mode is enabled for this deployment
 export PD_ENABLED="\"${PD_ENABLED:-false}\""