mirror of https://github.com/k3s-io/k3s
Merge pull request #66695 from dims/add-dnsmasq-to-dnsutils-image
Automatic merge from submit-queue (batch tested with PRs 66554, 66616, 66695, 66681). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add dnsmasq to test/images/dnsutils **What this PR does / why we need it**: We currently use k8s.gcr.io/k8s-dns-dnsmasq:1.14.5 in the dns_common.go file. Looking deeper, all we need is "/usr/sbin/dnsmasq" from that image. So just enhance the dnsutils image and throw dnsmasq into it. This makes it easier as the dockerfiles/sidecars etc in kubernetes/dns is not really needed. Note that a previous attempt to add manifests to that repo fell through in PR 30 in that repo (since we were moving to coredns). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: /cc @luxas /cc @ixdy /cc @mkumatag **Release note**: ```release-note NONE ```pull/8/head
commit
8ee9567454
|
@ -16,4 +16,4 @@ FROM BASEIMAGE
|
|||
|
||||
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
|
||||
|
||||
RUN apk add --no-cache bind-tools
|
||||
RUN apk add --no-cache bind-tools dnsmasq
|
||||
|
|
Loading…
Reference in New Issue