diff --git a/Dockerfile.dnsmasq-metrics b/Dockerfile.sidecar similarity index 100% rename from Dockerfile.dnsmasq-metrics rename to Dockerfile.sidecar diff --git a/Makefile b/Makefile index 0065a27d8..ffa9509f8 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ PKG := k8s.io/dns # List of binaries to build. You must have a matching Dockerfile.BINARY # for each BINARY. -BINARIES := dnsmasq-metrics +BINARIES := sidecar # Registry to push to. REGISTRY ?= gcr.io/google_containers diff --git a/cmd/dnsmasq-metrics/main.go b/cmd/sidecar/main.go similarity index 92% rename from cmd/dnsmasq-metrics/main.go rename to cmd/sidecar/main.go index fd0fd7d09..19168b2a5 100644 --- a/cmd/dnsmasq-metrics/main.go +++ b/cmd/sidecar/main.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" - "k8s.io/dns/pkg/server" + "k8s.io/dns/pkg/sidecar" "k8s.io/dns/pkg/version" ) @@ -38,22 +38,22 @@ const ( ) func main() { - options := server.NewOptions() + options := sidecar.NewOptions() configureFlags(options, pflag.CommandLine) flag.InitFlags() logs.InitLogs() defer logs.FlushLogs() - glog.Infof("dnsmasq-metrics v%s", version.VERSION) + glog.Infof("Version v%s", version.VERSION) verflag.PrintAndExitIfRequested() - server := server.NewServer() + server := sidecar.NewServer() server.Run(options) } -type probeOptions []server.DNSProbeOption +type probeOptions []sidecar.DNSProbeOption func (po *probeOptions) String() string { return fmt.Sprintf("%+v", *po) @@ -65,7 +65,7 @@ func (po *probeOptions) Set(value string) error { return fmt.Errorf("invalid format to --probe") } - option := server.DNSProbeOption{ + option := sidecar.DNSProbeOption{ Label: splits[0], Server: splits[1], Name: splits[2], @@ -105,7 +105,7 @@ func (po *probeOptions) Type() string { var _ pflag.Value = (*probeOptions)(nil) -func configureFlags(opt *server.Options, flagSet *pflag.FlagSet) { +func configureFlags(opt *sidecar.Options, flagSet *pflag.FlagSet) { flagSet.StringVar( &opt.DnsMasqAddr, "dnsmasq-addr", opt.DnsMasqAddr, "address that the dnsmasq server is listening on") diff --git a/pkg/dnsmasq/dnsmasq_test.go b/pkg/dnsmasq/dnsmasq_test.go index e0a6d3937..698104b28 100644 --- a/pkg/dnsmasq/dnsmasq_test.go +++ b/pkg/dnsmasq/dnsmasq_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "k8s.io/contrib/pkg/test" + "k8s.io/dns/pkg/test" "github.com/miekg/dns" ) diff --git a/pkg/server/dnsprobe.go b/pkg/sidecar/dnsprobe.go similarity index 99% rename from pkg/server/dnsprobe.go rename to pkg/sidecar/dnsprobe.go index cac1cbf72..708089d74 100644 --- a/pkg/server/dnsprobe.go +++ b/pkg/sidecar/dnsprobe.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package sidecar import ( "encoding/json" diff --git a/pkg/server/dnsprobe_test.go b/pkg/sidecar/dnsprobe_test.go similarity index 98% rename from pkg/server/dnsprobe_test.go rename to pkg/sidecar/dnsprobe_test.go index 6ea49e225..a5805becf 100644 --- a/pkg/server/dnsprobe_test.go +++ b/pkg/sidecar/dnsprobe_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package sidecar import ( "fmt" @@ -24,7 +24,7 @@ import ( "github.com/miekg/dns" - "k8s.io/contrib/pkg/test" + "k8s.io/dns/pkg/test" ) type mockLoopDelayer struct { diff --git a/pkg/server/metrics.go b/pkg/sidecar/metrics.go similarity index 99% rename from pkg/server/metrics.go rename to pkg/sidecar/metrics.go index 30790b138..fc94b3363 100644 --- a/pkg/server/metrics.go +++ b/pkg/sidecar/metrics.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package sidecar import ( "fmt" diff --git a/pkg/server/options.go b/pkg/sidecar/options.go similarity index 98% rename from pkg/server/options.go rename to pkg/sidecar/options.go index 3f2fb2bb1..02b685b4f 100644 --- a/pkg/server/options.go +++ b/pkg/sidecar/options.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package sidecar import "time" diff --git a/pkg/server/server.go b/pkg/sidecar/server.go similarity index 99% rename from pkg/server/server.go rename to pkg/sidecar/server.go index 292981393..58ef4309f 100644 --- a/pkg/server/server.go +++ b/pkg/sidecar/server.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package sidecar import ( "time" diff --git a/test/e2e/Dockerfile.e2e b/test/e2e/sidecar/Dockerfile.e2e similarity index 69% rename from test/e2e/Dockerfile.e2e rename to test/e2e/sidecar/Dockerfile.e2e index b45630756..6dcb44851 100644 --- a/test/e2e/Dockerfile.e2e +++ b/test/e2e/sidecar/Dockerfile.e2e @@ -2,8 +2,8 @@ FROM gcr.io/google_containers/kube-dnsmasq-amd64:1.4 MAINTAINER Bowei Du -COPY test/e2e/docker-run-e2e.sh /docker-run-e2e.sh -COPY bin/amd64/dnsmasq-metrics /dnsmasq-metrics +COPY test/e2e/sidecar/docker-run-e2e.sh /docker-run-e2e.sh +COPY bin/amd64/sidecar /sidecar RUN apk update && apk add curl bind-tools diff --git a/test/e2e/docker-run-e2e.sh b/test/e2e/sidecar/docker-run-e2e.sh similarity index 78% rename from test/e2e/docker-run-e2e.sh rename to test/e2e/sidecar/docker-run-e2e.sh index 3df04fa53..9caae034e 100644 --- a/test/e2e/docker-run-e2e.sh +++ b/test/e2e/sidecar/docker-run-e2e.sh @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Docker side of the E2E test for dnsmasq-metrics. This runs an -# instance of dnsmasq and dnsmasq-metrics, sends some DNS queries to +# Docker side of the E2E test for sidecar. This runs an +# instance of dnsmasq and sidecar, sends some DNS queries to # the daemon and dumps the output of the prometheus /metrics URI. run() { echo RUN "$@" @@ -22,12 +22,12 @@ run() { } dnsmasq="/usr/sbin/dnsmasq" -dnsmasq_metrics="/dnsmasq-metrics" +sidecar="/sidecar" dnsmasq_port=10053 dig_out="/tmp/dig.out" dnsmasq_out="/tmp/dnsmasq.out" -dnsmasq_metrics_out="/tmp/dnsmasq_metrics.out" +sidecar_out="/tmp/sidecar.out" metrics_out="/tmp/metrics.out" curl="/usr/bin/curl" @@ -47,14 +47,14 @@ run ${dnsmasq} \ dnsmasq_pid=$! echo "dnsmasq_pid=${dnsmasq_pid}" -run ${dnsmasq_metrics} \ +run ${sidecar} \ --dnsmasq-port ${dnsmasq_port} -v 4 \ --probe "ok,127.0.0.1:${dnsmasq_port},ok.local,1" \ --probe "nxdomain,127.0.0.1:${dnsmasq_port},nx.local,1" \ --probe "notpresent,127.0.0.1:$((dnsmasq_port + 1)),notpresent.local,1" \ - 2> ${dnsmasq_metrics_out} & -dnsmasq_metrics_pid=$! -echo "dnsmasq_metrics_pid=${dnsmasq_metrics_pid}" + 2> ${sidecar_out} & +sidecar_pid=$! +echo "sidecar_pid=${sidecar_pid}" # Do a bunch of digs to make sure the cache is hit. for i in `seq 100`; do @@ -63,7 +63,7 @@ done kill -SIGUSR1 ${dnsmasq_pid} -# Give dnsmasq_metrics some time to updates its metrics. +# Give sidecar some time to updates its metrics. echo "Waiting ${sleep_interval} seconds" sleep ${sleep_interval} @@ -79,9 +79,9 @@ echo "BEGIN dnsmasq ====" cat ${dnsmasq_out} echo "END dnsmasq ====" echo -echo "BEGIN dnsmasq_metrics ====" -cat ${dnsmasq_metrics_out} -echo "END dnsmasq_metrics ====" +echo "BEGIN sidecar ====" +cat ${sidecar_out} +echo "END sidecar ====" echo echo "BEGIN metrics ====" cat ${metrics_out} diff --git a/test/e2e/e2e.sh b/test/e2e/sidecar/e2e.sh similarity index 94% rename from test/e2e/e2e.sh rename to test/e2e/sidecar/e2e.sh index f52b42772..9f0fda674 100644 --- a/test/e2e/e2e.sh +++ b/test/e2e/sidecar/e2e.sh @@ -27,15 +27,15 @@ if ! which awk >/dev/null; then exit 1 fi -if [ ! -e bin/amd64/dnsmasq-metrics ]; then - echo "dnsmasq-metrics not found (need to build?)" +if [ ! -e "bin/amd64/sidecar" ]; then + echo "binary not found (need to build?)" exit 1 fi uuid=`date +%s` -image_tag="kubernetes-contrib-dnsmasq-metrics-e2e-${uuid}" +image_tag="k8s-dns-sidecar-e2e-${uuid}" output_dir=`mktemp -d` -e2e_dir=test/e2e +e2e_dir=test/e2e/sidecar if [ "$CLEANUP" != 'no' ]; then cleanup() {