From 8f024f0d3038433382fefcb596e75c691f12c696 Mon Sep 17 00:00:00 2001
From: Ivan Ka <5395690+ivankatliarchuk@users.noreply.github.com>
Date: Mon, 6 Apr 2026 12:53:31 +0100
Subject: [PATCH] ci: fix revision label (#6332)

* fix(ci): fix revision label

Signed-off-by: ivan katliarchuk <ivan.katliarchuk@gmail.com>

* fix(ci): set OCI revision label and binary git commit in Cloud Build

Signed-off-by: ivan katliarchuk <ivan.katliarchuk@gmail.com>

---------

Signed-off-by: ivan katliarchuk <ivan.katliarchuk@gmail.com>
---
 Makefile        | 4 +++-
 cloudbuild.yaml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dc0d00b25..f21a6f7ab 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,9 @@ IMAGE_STAGING  = gcr.io/k8s-staging-external-dns/$(BINARY)
 REGISTRY      ?= us.gcr.io/k8s-artifacts-prod/external-dns
 IMAGE         ?= $(REGISTRY)/$(BINARY)
 VERSION       ?= $(shell git describe --tags --always --dirty --match "v*")
+GIT_REVISION  ?= $(shell git rev-parse HEAD)
 GIT_COMMIT    ?= $(shell git rev-parse --short HEAD)
+GIT_COMMIT    := $(or $(GIT_COMMIT),$(shell echo "$(GIT_REVISION)" | cut -c1-7))
 BUILD_FLAGS   ?= -v
 LDFLAGS       ?= -X sigs.k8s.io/external-dns/pkg/apis/externaldns.Version=$(VERSION) -w -s
 LDFLAGS       += -X sigs.k8s.io/external-dns/pkg/apis/externaldns.GitCommit=$(GIT_COMMIT)
@@ -108,7 +110,7 @@ build.push/multiarch: ko
 	VERSION=${VERSION} \
 	ko build --tags ${VERSION} --bare --sbom ${IMG_SBOM} \
 		--image-label org.opencontainers.image.source="https://github.com/kubernetes-sigs/external-dns" \
-		--image-label org.opencontainers.image.revision=$(shell git rev-parse HEAD) \
+		--image-label org.opencontainers.image.revision=$(GIT_REVISION) \
 		--platform=${IMG_PLATFORM}  --push=${IMG_PUSH} .
 
 build.image/multiarch:
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index b352435e3..6ae550740 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -9,6 +9,7 @@ steps:
     entrypoint: make
     env:
       - VERSION=$_GIT_TAG
+      - GIT_REVISION=$_PULL_BASE_SHA
       - PULL_BASE_REF=$_PULL_BASE_REF
     args:
       - release.staging
@@ -16,4 +17,5 @@ substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution
   _GIT_TAG: "12345"
+  _PULL_BASE_SHA: ""
   _PULL_BASE_REF: 'master'