address review comments

Signed-off-by: Lionel Villard <villard@us.ibm.com>

Author: lionelvillard

Dockerfile.activator

@@ -1,28 +1,42 @@
-## Multistage build
+# Build Stage: using Go 1.25 image
 FROM quay.io/projectquay/golang:1.25 AS builder
-ARG COMMIT_SHA=unknown
-ARG BUILD_REF
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
-ENV CGO_ENABLED=0
-ENV GOOS=$TARGETOS
-ENV GOARCH=$TARGETARCH
+ARG TARGETOS
+ARG TARGETARCH
 
-# Dependencies
-WORKDIR /src
-COPY go.mod go.sum ./
-RUN go mod download
+WORKDIR /workspace
 
-# Sources
+# Copy the Go Modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+
+# Copy the go source
 COPY cmd/activator ./cmd/activator
 COPY pkg/activator ./pkg/activator
-WORKDIR /src/cmd/activator
-RUN go build -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/version.CommitSHA=${COMMIT_SHA} -X sigs.k8s.io/gateway-api-inference-extension/version.BuildRef=${BUILD_REF}" -o /activator
 
-## Multistage deploy
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
+# 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.
+ENV CGO_ENABLED=0
+ENV GOOS=${TARGETOS:-linux}
+ENV GOARCH=${TARGETARCH}
+ARG COMMIT_SHA=unknown
+ARG BUILD_REF
+RUN go build -a -o bin/activator -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/version.CommitSHA=${COMMIT_SHA} -X sigs.k8s.io/gateway-api-inference-extension/version.BuildRef=${BUILD_REF}" cmd/activator/main.go
+
 
+# Use ubi9 as a minimal base image to package the manager binary
+# Refer to https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5 for more details
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 WORKDIR /
-COPY --from=builder /activator /activator
+COPY --from=builder /workspace/bin/activator /app/activator
+
+# expose gRPC, health and metrics ports
+EXPOSE 9002
+EXPOSE 9003
+EXPOSE 9090
+
+USER 65532:65532
 
-ENTRYPOINT ["/activator"]
+ENTRYPOINT ["/app/activator"]

Dockerfile.epp

@@ -1,4 +1,4 @@
-# Build Stage: using Go 1.24.1 image
+# Build Stage: using Go 1.25 image
 FROM quay.io/projectquay/golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH

cmd/activator/runner/runner.go

@@ -75,7 +75,7 @@ func Run(ctx context.Context) error {
 	flag.Parse()
 	initLogging(&opts)
 
-	setupLog.Info("GIE build", "commit-sha", version.CommitSHA, "build-ref", version.BuildRef)
+	setupLog.Info("Activator build", "commit-sha", version.CommitSHA, "build-ref", version.BuildRef)
 
 	// Validate flags
 	if err := validateFlags(); err != nil {
@@ -109,7 +109,7 @@ func Run(ctx context.Context) error {
 
 	// --- Setup Deactivator ---
 	if *enableScaleToZero {
-		deactivator, err := requestcontrol.DeactivatorWithConfig(cfg, &datastore)
+		deactivator, err := requestcontrol.DeactivatorWithConfig(cfg, datastore)
 		if err != nil {
 			setupLog.Error(err, "Failed to setup Deactivator")
 			return err

pkg/activator/datastore/datastore.go

@@ -41,7 +41,7 @@ type Datastore interface {
 	PoolGet() (*v1.InferencePool, error)
 	PoolHasSynced() bool
 
-	GetTicker() *time.Ticker
+	GetTickerCh() <-chan time.Time
 	ResetTicker(t time.Duration)
 	StopTicker()
 
@@ -52,16 +52,13 @@ type Datastore interface {
 // NewDatastore creates a new Datastore instance with the provided parent context.
 func NewDatastore(parentCtx context.Context) Datastore {
 	store := &datastore{
-		parentCtx: parentCtx,
-		poolMu:    sync.RWMutex{},
-		ticker:    time.NewTicker(60 * time.Second),
+		poolMu: sync.RWMutex{},
+		ticker: time.NewTicker(60 * time.Second),
 	}
 	return store
 }
 
 type datastore struct {
-	// parentCtx controls the lifecycle of the background metrics goroutines that spawn up by the datastore.
-	parentCtx context.Context
 	// poolMu is used to synchronize access to pool map.
 	poolMu sync.RWMutex
 	pool   *v1.InferencePool
@@ -79,7 +76,7 @@ func (ds *datastore) PoolSet(pool *v1.InferencePool) {
 func (ds *datastore) PoolGet() (*v1.InferencePool, error) {
 	ds.poolMu.RLock()
 	defer ds.poolMu.RUnlock()
-	if !ds.PoolHasSynced() {
+	if ds.pool == nil {
 		return nil, errPoolNotSynced
 	}
 	return ds.pool, nil
@@ -96,19 +93,19 @@ func (ds *datastore) Clear() {
 }
 
 func (ds *datastore) ResetTicker(t time.Duration) {
-	ds.poolMu.RLock()
-	defer ds.poolMu.RUnlock()
+	ds.poolMu.Lock()
+	defer ds.poolMu.Unlock()
 	ds.ticker.Reset(t)
 }
 
-func (ds *datastore) GetTicker() *time.Ticker {
+func (ds *datastore) GetTickerCh() <-chan time.Time {
 	ds.poolMu.RLock()
 	defer ds.poolMu.RUnlock()
-	return ds.ticker
+	return ds.ticker.C
 }
 
 func (ds *datastore) StopTicker() {
-	ds.poolMu.RLock()
-	defer ds.poolMu.RUnlock()
+	ds.poolMu.Lock()
+	defer ds.poolMu.Unlock()
 	ds.ticker.Stop()
 }

pkg/activator/requestcontrol/deactivator.go

@@ -26,11 +26,11 @@ type Deactivator struct {
 	DynamicClient *dynamic.DynamicClient
 	ScaleClient   scale.ScalesGetter
 	Mapper        meta.RESTMapper
-	datastore     *datastore.Datastore
+	datastore     datastore.Datastore
 }
 
 // DeactivatorWithConfig creates a new Deactivator with the provided REST config and Datastore.
-func DeactivatorWithConfig(config *rest.Config, datastore *datastore.Datastore) (*Deactivator, error) {
+func DeactivatorWithConfig(config *rest.Config, datastore datastore.Datastore) (*Deactivator, error) {
 	scaleClient, mapper, err := initScaleClient(config)
 	if err != nil {
 		return nil, err
@@ -51,20 +51,22 @@ func DeactivatorWithConfig(config *rest.Config, datastore *datastore.Datastore)
 // MonitorInferencePoolIdleness monitors the InferencePool for idleness and scales it down to zero replicas
 func (da *Deactivator) MonitorInferencePoolIdleness(ctx context.Context) {
 	logger := log.FromContext(ctx)
-	ds := *(da.datastore)
+	ds := da.datastore
 
+	// The deactivator uses a ticker to periodically try and scale down the InferencePool after idleness.
+	// Upon each received requests, the ticker is reset to delay the next scale-down check.
 	ds.ResetTicker(DefaultScaleDownDelay)
 	defer ds.StopTicker()
 
-	ticker := ds.GetTicker()
+	tickerCh := ds.GetTickerCh()
 
 	for {
 		select {
 		case <-ctx.Done():
 			logger.Info("Context cancelled, stopping deactivator")
 			return
-		case <-ticker.C:
-			logger.V(logutil.DEBUG).Info("Deactivator Time check for inferencePool idleness: " + time.Now().Format("15:04:05"))
+		case <-tickerCh:
+			logger.V(logutil.DEBUG).Info("Deactivator time check for inferencePool idleness: " + time.Now().Format("15:04:05"))
 
 			// Get InferencePool Info
 			pool, err := ds.PoolGet()