fix: pass commit hash from the cloud build default variable (#763)

TESTED with both local run of:
- make image-push
- cloud-build-local command

Author: JeffLuoo

Dockerfile

@@ -8,6 +8,7 @@ FROM ${BUILDER_IMAGE} AS builder
 ENV CGO_ENABLED=0
 ENV GOOS=linux
 ENV GOARCH=amd64
+ARG COMMIT_SHA=unknown
 
 # Dependencies
 WORKDIR /src
@@ -19,9 +20,8 @@ COPY cmd ./cmd
 COPY pkg ./pkg
 COPY internal ./internal
 COPY api ./api
-COPY .git ./.git
 WORKDIR /src/cmd/epp
-RUN go build -buildvcs=true -o /epp
+RUN go build -ldflags="-X sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics.CommitSHA=${COMMIT_SHA}" -o /epp
 
 ## Multistage deploy
 FROM ${BASE_IMAGE}

Makefile

@@ -21,6 +21,7 @@ CONTAINER_TOOL ?= docker
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
+GIT_COMMIT_SHA ?= "$(shell git rev-parse HEAD 2>/dev/null)"
 GIT_TAG ?= $(shell git describe --tags --dirty --always)
 PLATFORMS ?= linux/amd64
 DOCKER_BUILDX_CMD ?= docker buildx
@@ -175,6 +176,7 @@ image-build: ## Build the EPP image using Docker Buildx.
 		--platform=$(PLATFORMS) \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 		--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \
+		--build-arg COMMIT_SHA=${GIT_COMMIT_SHA} \
 		$(PUSH) \
 		$(LOAD) \
 		$(IMAGE_BUILD_EXTRA_OPTS) ./

cloudbuild.yaml

@@ -12,6 +12,7 @@ steps:
     - GIT_TAG=$_GIT_TAG
     - EXTRA_TAG=$_PULL_BASE_REF
     - DOCKER_BUILDX_CMD=/buildx-entrypoint
+    - GIT_COMMIT_SHA=$COMMIT_SHA
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240718-5ef92b5c36
     entrypoint: make
     args:

pkg/epp/metrics/metrics.go

@@ -18,7 +18,6 @@ package metrics
 
 import (
 	"context"
-	"runtime/debug"
 	"sync"
 	"time"
 
@@ -37,7 +36,7 @@ const (
 
 var (
 	// The git hash of the latest commit in the build.
-	CommitHash string
+	CommitSHA string
 )
 
 var (
@@ -337,25 +336,7 @@ func RecordSchedulerPluginProcessingLatency(pluginType, pluginName string, durat
 }
 
 func RecordInferenceExtensionInfo() {
-	if CommitHash != "" {
-		InferenceExtensionInfo.WithLabelValues(CommitHash).Set(1)
+	if CommitSHA != "" {
+		InferenceExtensionInfo.WithLabelValues(CommitSHA).Set(1)
 	}
 }
-
-func init() {
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return
-	}
-
-	var Commit = func(i *debug.BuildInfo) string {
-		for _, setting := range i.Settings {
-			if setting.Key == "vcs.revision" {
-				return setting.Value
-			}
-		}
-		return ""
-	}(info)
-
-	CommitHash = Commit
-}