mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-07 18:16:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3760 from cgroschupp/change-version-command

Browse Source 
use only tags with prefix v for version determination
This commit is contained in:
Kubernetes Prow Robot 2023-07-03 09:40:52 -07:00 committed by GitHub
commit 92824f4f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -87,7 +87,7 @@ BINARY ?= external-dns
SOURCES = $(shell find . -name '*.go') SOURCES = $(shell find . -name '*.go')
IMAGE_STAGING = gcr.io/k8s-staging-external-dns/$(BINARY) IMAGE_STAGING = gcr.io/k8s-staging-external-dns/$(BINARY)
IMAGE ?= us.gcr.io/k8s-artifacts-prod/external-dns/$(BINARY) IMAGE ?= us.gcr.io/k8s-artifacts-prod/external-dns/$(BINARY)
VERSION ?= $(shell git describe --tags --always --dirty) VERSION ?= $(shell git describe --tags --always --dirty --match "v*")
BUILD_FLAGS ?= -v 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.Version=$(VERSION) -w -s
ARCHS = amd64 arm64 arm/v7 ARCHS = amd64 arm64 arm/v7

2
scripts/releaser.sh
View File

@ -9,7 +9,7 @@ function generate_changelog {
# current tag is a full release # current tag is a full release
previous_tag="" previous_tag=""
while [[ -z $previous_tag || ( $previous_tag == *-* && $current_tag != *-* ) ]]; do while [[ -z $previous_tag || ( $previous_tag == *-* && $current_tag != *-* ) ]]; do
previous_tag="$(git describe --tags "$start_ref"^ --abbrev=0)" previous_tag="$(git describe --tags "$start_ref"^ --abbrev=0 --match "v*")"
start_ref="$previous_tag" start_ref="$previous_tag"
done done

2
scripts/run-trivy.sh
View File

@ -10,4 +10,4 @@ chmod +x trivy
# run trivy # run trivy
cd - cd -
/tmp/trivy image --exit-code 1 us.gcr.io/k8s-artifacts-prod/external-dns/external-dns:$(git describe --tags --always --dirty) /tmp/trivy image --exit-code 1 us.gcr.io/k8s-artifacts-prod/external-dns/external-dns:$(git describe --tags --always --dirty --match "v*")