Review fixes and added version info

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

Author: shmuelk

Dockerfile.sidecar

@@ -2,6 +2,8 @@
 FROM quay.io/projectquay/golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
+ARG COMMIT_SHA=unknown
+ARG BUILD_REF
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -12,19 +14,25 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY cmd/llm-d-routing-sidecar/main.go cmd/cmd.go
+COPY cmd/pd-sidecar/main.go cmd/cmd.go
 COPY pkg/sidecar pkg/sidecar
+COPY pkg/common pkg/common
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
 # was called. For example, if we call make image-build in a local env which has the Apple Silicon M1 SO
 # the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o bin/llm-d-routing-sidecar cmd/cmd.go
+ENV CGO_ENABLED=0
+ENV GOOS=${TARGETOS:-linux}
+ENV GOARCH=${TARGETARCH}
+RUN go build -a -o bin/pd-sidecar \
+       -ldflags="-X github.com/llm-d/llm-d-inference-scheduler/pkg/sidecar/version.CommitSHA=${COMMIT_SHA} -X github.com/llm-d/llm-d-inference-scheduler/pkg/sidecar/version.BuildRef=${BUILD_REF}" \
+       cmd/cmd.go
 
 FROM registry.access.redhat.com/ubi9/ubi-micro:latest
 WORKDIR /
-COPY --from=builder /workspace/bin/llm-d-routing-sidecar /app/llm-d-routing-sidecar
+COPY --from=builder /workspace/bin/pd-sidecar /app/pd-sidecar
 USER 65532:65532
 
-ENTRYPOINT ["/app/llm-d-routing-sidecar"]
+ENTRYPOINT ["/app/pd-sidecar"]

Makefile

@@ -7,13 +7,14 @@ SHELL := /usr/bin/env bash
 TARGETOS ?= $(shell go env GOOS)
 TARGETARCH ?= $(shell go env GOARCH)
 PROJECT_NAME ?= llm-d-inference-scheduler
-SIDECAR_NAME ?= llm-d-routing-sidecar
+SIDECAR_IMAGE_NAME ?= llm-d-routing-sidecar
+SIDECAR_NAME ?= pd-sidecar
 IMAGE_REGISTRY ?= ghcr.io/llm-d
 IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY)/$(PROJECT_NAME)
 EPP_TAG ?= dev
 IMG = $(IMAGE_TAG_BASE):$(EPP_TAG)
 SIDECAR_TAG ?= dev
-SIDECAR_IMAGE_TAG_BASE ?= ghcr.io/llm-d/$(SIDECAR_NAME)
+SIDECAR_IMAGE_TAG_BASE ?= ghcr.io/llm-d/$(SIDECAR_IMAGE_NAME)
 SIDECAR_IMG = $(SIDECAR_IMAGE_TAG_BASE):$(SIDECAR_TAG)
 NAMESPACE ?= hc4ai-operator
 
@@ -155,8 +156,10 @@ image-push: check-container-tool ## Push Docker image $(IMG) to registry
 sidecar-image-build: check-container-tool ## Build Sidecar Docker image ## Build Sidecar Docker image using $(CONTAINER_TOOL)
 	@printf "\033[33;1m==== Building Sidecar Docker image $(SIDECAR_IMG) ====\033[0m\n"
 	$(CONTAINER_TOOL) build \
-	    --build-arg TARGETOS=linux \
+		--build-arg TARGETOS=linux \
 		--build-arg TARGETARCH=$(TARGETARCH) \
+		--build-arg COMMIT_SHA=${GIT_COMMIT_SHA} \
+		--build-arg BUILD_REF=${BUILD_REF} \
 		-t $(SIDECAR_IMG) -f Dockerfile.sidecar .
 
 .PHONY: sidecar-image-push

cmd/llm-d-routing-sidecar/main.go cmd/pd-sidecar/main.gocmd/llm-d-routing-sidecar/main.go renamed to cmd/pd-sidecar/main.go

@@ -16,15 +16,15 @@ limitations under the License.
 package main
 
 import (
-	"context"
 	"flag"
 	"net/url"
 	"os"
 
 	"k8s.io/klog/v2"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/llm-d/llm-d-inference-scheduler/pkg/sidecar/proxy"
-	"github.com/llm-d/llm-d-inference-scheduler/pkg/sidecar/signals"
+	"github.com/llm-d/llm-d-inference-scheduler/pkg/sidecar/version"
 )
 
 func main() {
@@ -50,16 +50,15 @@ func main() {
 	// make sure to flush logs before exiting
 	defer klog.Flush()
 
-	ctx := signals.SetupSignalHandler(context.Background())
+	ctx := ctrl.SetupSignalHandler()
 	logger := klog.FromContext(ctx)
 
-	if *connector != proxy.ConnectorNIXLV1 && *connector != proxy.ConnectorNIXLV2 && *connector != proxy.ConnectorLMCache {
-		logger.Info("Error: --connector must either be 'nixl', 'nixlv2' or 'lmcache'")
+	logger.Info("Proxy starting", "Built on", version.BuildRef, "From Git SHA", version.CommitSHA)
+
+	if *connector != proxy.ConnectorNIXLV2 && *connector != proxy.ConnectorLMCache {
+		logger.Info("Error: --connector must either be 'nixlv2' or 'lmcache'")
 		return
 	}
-	if *connector == proxy.ConnectorNIXLV1 {
-		logger.Info("Warning: nixl connector is deprecated and will be removed in a future release in favor of --connector=nixlv2")
-	}
 	logger.Info("p/d connector validated", "connector", connector)
 
 	// Determine namespace and pool name for SSRF protection

pkg/sidecar/proxy/connector_nixl.go

@@ -49,9 +49,6 @@ const (
 	requestFieldStream           = "stream"
 	requestFieldStreamOptions    = "stream_options"
 
-	// ConnectorNIXLV1 enables the (now deprecated) P/D NIXL v1 protocol
-	ConnectorNIXLV1 = "nixl"
-
 	// ConnectorNIXLV2 enables the P/D NIXL v2 protocol
 	ConnectorNIXLV2 = "nixlv2"
 
@@ -128,8 +125,6 @@ func NewProxy(port string, decodeURL *url.URL, config Config) (*Server, error) {
 	switch config.Connector {
 	case ConnectorLMCache:
 		server.runConnectorProtocol = server.runLMCacheProtocol
-	case ConnectorNIXLV1:
-		server.runConnectorProtocol = server.runNIXLProtocolV1
 	case ConnectorNIXLV2:
 		fallthrough
 	default:

pkg/sidecar/proxy/proxy.go

@@ -0,0 +1,11 @@
+// The version package contains build version information
+package version
+
+var (
+	// The git hash of the latest commit in the build.
+	CommitSHA string
+
+	// The build ref from the _PULL_BASE_REF from cloud build trigger.
+	BuildRef string
+)
+