mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2026-05-04 22:26:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix revision label (#6332)

Browse Source 
* 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>
This commit is contained in:
Ivan Ka 2026-04-06 12:53:31 +01:00 committed by GitHub
parent a3a692aa97
commit 8f024f0d30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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:

2
cloudbuild.yaml
View File

@ -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'