Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update CoreDNS to v1.11.1 (backport of #7523) #7528

Merged
merged 2 commits into from
Aug 23, 2023
Merged

chore(deps): update CoreDNS to v1.11.1 (backport of #7523) #7528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dbb6af
chore(deps): update CoreDNS to v1.11.1 (#7523)
michaelbeaumont Aug 16, 2023
f4e4556
build: don't pin coredns/alternate
michaelbeaumont Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mk/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GO_BUILD := GOOS=${GOOS} GOARCH=${GOARCH} $(GOENV) go build -v $(GOFLAGS) $(LD_F
GO_BUILD_COREDNS := GOOS=${GOOS} GOARCH=${GOARCH} $(GOENV) go build -v

COREDNS_GIT_REPOSITORY ?= https://github.com/coredns/coredns.git
COREDNS_VERSION ?= v1.10.1
COREDNS_VERSION ?= v1.11.1
COREDNS_TMP_DIRECTORY ?= $(BUILD_DIR)/coredns
COREDNS_PLUGIN_CFG_PATH ?= $(TOP)/tools/builds/coredns/templates/plugin.cfg

Expand Down Expand Up @@ -100,7 +100,7 @@ ifeq (,$(wildcard $(BUILD_ARTIFACTS_DIR)/coredns/coredns))
cp $(COREDNS_PLUGIN_CFG_PATH) $(COREDNS_TMP_DIRECTORY)
cd $(COREDNS_TMP_DIRECTORY) && \
GOOS= GOARCH= go generate coredns.go && \
go get github.com/coredns/alternate@f0d10f2aa3aaf31ba841a3f2e7a69fa664d8fccc && \
go get github.com/coredns/alternate && \
$(GO_BUILD_COREDNS) -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=$(shell git describe --dirty --always)" -o $(BUILD_ARTIFACTS_DIR)/coredns/coredns
rm -rf "$(COREDNS_TMP_DIRECTORY)"
else
Expand Down