Commit graph

516 commits

Author SHA1 Message Date
Miek Gieben
9c62ddaa01 Small golint cleanup ()
* Small golint cleanup

Mostly docs in autopath.

* duh
2017-08-24 08:56:48 +01:00
Miek Gieben
10b7221067 mw/kubernetes: revert if-else for health ()
Do the return early and dedent the rest of the function.
2017-08-23 08:30:19 -07:00
Miek Gieben
4b105c761e Parse fix ()
* mw/kubernetes: add apex test

This adds small test case for apex queries: SOA and HINFO.

Fix (obvious) parse bug in parse.go.

* Test Ns request also here
2017-08-23 14:07:10 +01:00
Miek Gieben
61fc672e19 mw/kubernetes: remove kPod and kServices ()
Based up on: , but redone in a new PR with some cherry-picked
commits:
aacb91ef0b
5dc34247b7

This removes kPod and Kservice and creates []msg.Service from k.findPods
and k.findServices.

Updated few tests which I *think* are correct; they look correct to me.
2017-08-23 07:19:41 +01:00
Miek Gieben
7f5086e97a mw/kubernetes: don't export Pod-mode constants. ()
* mw/kubernetes: don't export Pod-mode constants.

* merged
2017-08-22 22:11:48 +01:00
Miek Gieben
12db6618c8 mw/kubernetes: resync to opts ()
* mw/kubernetes: resync to opts

Only used to initialize the cache that already has a dnsControlopts, so
remove it from the main kubernetes struct.

* Fix test

* mw/kubernetes: LabelSelector to options as well

Labels select is also only used for init. Don't carry it in the main
kubernetes struct.

* remove this test: can't happen

Caddyfile parser will only call setup when it sees kubernetes.

* erge gone wrong
2017-08-22 21:52:18 +01:00
Miek Gieben
6a4e69eb9f mw/kubernetes: Rewrite parseRequest and Readability improvements ()
* mw/kubernetes: rewrite parseRequest

Stop looking at the qtype in parseRequest and make k.Namespace a map.
Fallout from this is that pkg/strings as it is not used anymore. Also
add a few helper functions to make unexposed namespaces easier to see in
the code.

Add wildcard tests to the middleware tests.

* Fix tests

Add a whole bunch of comments to document what we are trying to do.

* This is now answered

* up coverage

* duh

* Update testcase

* Make it nodata
2017-08-22 12:44:42 -07:00
Miek Gieben
60d5e71a1a mw/*: updates docs about upstream ()
Upstream allows file structured like /etc/resolv.conf. Update docs.

Fixes 
2017-08-22 14:56:00 +01:00
Miek Gieben
5604568655 mw/auto: increate setup coverage ()
Fixes 
2017-08-22 14:52:20 +01:00
Miek Gieben
8931ede142 core: hide registerHandler ()
* core: hide registerHandler

Remove RegisterHandler and just make it implicit when we look at the
handler compilation step.

* Rename GetHandler to just Handler

Update callers and make auto check Hander in OnStartup.

* Up test coverage in erratic

* up test coverage
2017-08-22 14:21:42 +01:00
Miek Gieben
65009b5578 mw/autopath: a minimal bug section ()
Briefly highlight that autopath might return the wrong results to pods
in different namespaces.

Fixes 
2017-08-21 08:57:54 +01:00
Miek Gieben
fe75e1b6f9 mw/file: add include test ()
$INCLUDE was fixed in miekg/dns, create tests in CoreDNS so that we know
we have the latest version.

Fixes 
2017-08-21 08:20:17 +01:00
Miek Gieben
87eb0d39a4 Move nonwriter to mw/pkg/nonwriter ()
Make it its own package as shared between autopath and federation.

Fixes 
2017-08-19 17:28:42 +01:00
Miek Gieben
02955d7594 Dns.join ()
* Add dnsutil.Join

* Create dnsutil.Join

Create Join helper function and move bits in the code over.
2017-08-19 15:22:09 +01:00
Miek Gieben
7c343982a6 backend.Records make it take request.Request ()
This is more general and aligns well with the other methods.
Also allows the kubernetes middleware to use it.

Fixes 
2017-08-19 14:03:03 +01:00
Miek Gieben
627687b11f mw/kubernetes: remove zone from parseRequest ()
* mw/kubernetes: remove zone from parseRequest

State has the zone info as well, so don't need to have it in
parseRequest anymore.

* Fix up tests

* improve test coverage
2017-08-19 07:18:35 +01:00
Miek Gieben
f96cf27193 mw/federation: add federation back as separate mw for k8s ()
* mw/federaration

This PR add the federation back as a middleware to keep it more
contained from the main kubernetes code.

It also makes parseRequest less import and pushes this functionlity down
in the k.Entries. This minimizes (or tries to) the importance for the
qtype in the query. In the end the qtype checking should only happen
in ServeDNS - but for k8s this might proof difficult.

Numerous other cleanup in code and kubernetes tests.

* up test coverage
2017-08-18 14:45:20 +01:00
Miek Gieben
cc4e4a0626 mw/autopath: integration test with erratic ()
Add integration test with erratic. For this erratic now also returns an
autopath searchpath. This tests the whole chain; i.e registring a
searchfunction and calling that from autopath.

This tests does a autopathing domain and a non-autopathing one.
2017-08-18 12:57:23 +01:00
Miek Gieben
5a1875120c mw/kubernetes: add reverse test case ()
Add a non-arpa testcase to the reverse test.
2017-08-17 18:42:14 +01:00
Miek Gieben
7f46df6d27 tests: add SortAndCheck helper ()
There was quite some code duplication in a lot of tests to check if
an answer was considered Ok. Created a test.SortAndCheck helper function
that takes care of this.
2017-08-16 15:30:58 +01:00
John Belamaric
65b56248f0 Remove use of hostnames in upstreams ()
Only IP:Port or file name is allowed.
2017-08-16 10:00:32 -04:00
Miek Gieben
06644c2855 mw/kubernetes: add reverse_test.go ()
This PR adds a reverse tests that copies some of it from the main
integration test. This aids in local testing because you don't need
a full k8s setup running.

It does the most minimal testing, a successful return and a nodata
response that includes the SOA for in-addr.arpa.
2017-08-16 07:33:35 +01:00
Miek Gieben
479c8bbaa9 Reverse in k8s ()
* mw/kubernetes: reverse zone in ZONE stanza not parsed

Properly parse the reverse zone syntax in the ZONES stanza as promised
in the README.

As short test case to test.

* add test
2017-08-16 07:29:46 +01:00
insomniac
1ab8b37e7e Make CoreDNS build on Go 1.7 () 2017-08-14 13:51:18 -07:00
Miek Gieben
00f5c7797e mw/kubernetes: remove federation and cidr ()
* mw/kubernetes: remove federation and cidr

Remove both as we have a corefile syntax change that handles cidr and
remove federation because that is going to be its own middleware.

* backwards incompat changes

This PR:
* removes cidr from kubernetes (core Corefile feature now)
* removes federation from kubernets (comes back as new middleware)
* [remove autopath - which was already gone, so that already was
  backwards incompat]
* adds `fallthrough` to the *etcd* middleware and makes you enable it.
* Fail on unknown properties
* documentation
* Disable TestHealthCheck as it uses realtime and fails
2017-08-14 08:49:26 +01:00
Miek Gieben
818d2b10ad cidr everywhere: check all middleware ()
* cidr everywhere: check all middleware

Add tests for cidr in only that middleware that already tests for this.
Check the other ones manually (and put reverse in the tests cases
anyway).

Make etcd setup_test run without +build etcd tag - it is not needed
for this test - move rest of the code to lookup_test.go.

Cleanup proxy test a bit and remove TempDir as there is test.TempFile
that does the same thing.

Fixes 

* coredns package

* Fix test compile
2017-08-13 18:16:25 +01:00
Yong Tang
a6d2d7b5f7 go lint cleanup ()
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-08-11 19:48:11 -07:00
Chris O'Haver
ebcbe66bbd Add Autopath section to k8s readme ()
The primary driver for autopath was kubernetes.  It addresses a specific need in kubernetes, so it deserves a mention in the K8s README, with an example.
2017-08-11 16:25:59 +01:00
Miek Gieben
241e3dbcb7 mw/k8s: cleanups ()
* mw/k8s: cleanups

Remove some constants that aren't used any more. Make PrimaryZone
private because it doesn't need to be exported. Remove test that
did not cover corner case as expressed in setup.go

* cleanup this as well
2017-08-11 16:21:07 +01:00
Chris O'Haver
028a6db4d6 README Typos ()
Found a few typos, spelling, and grammar errors.
2017-08-11 10:16:43 -04:00
Chris O'Haver
5468a6e162 Fix some typos in README ()
remove extraneous "]"s from the syntax def...
2017-08-11 10:16:24 -04:00
Miek Gieben
28b8a09240 Use server block defaults ()
* mw/k8s: Test Federation parsing

The test case was there, but there was nothing testing it?!?!?!
Add it and split it out of the main setup test which is too long
already.

Also allow kubernetes a not have a ZONE, just default to the serverblock
in that case. Remove test that was blocking that.

Cleanup up the readme more.

* rewrite README
2017-08-11 12:50:12 +01:00
Miek Gieben
6e91408f61 mw/k8s: use request.Request in parseRequest 2017-08-11 12:12:21 +01:00
Miek Gieben
b5d2a82ed7 mw/k8s: remove k.defaultNsMsg() ()
Remove k.defaultNSMsg() it is just one line of getting the service and
it is another method that needlessly uses recordRequest.
2017-08-11 08:34:35 +01:00
Yong Tang
c0f62e3f65 go lint cleanup ()
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-08-10 18:00:23 -07:00
Yong Tang
26d8680a11 Support multiple k8s api servers specification and load balance among api servers ()
* Support multiple k8s api servers specification and load balance among api servers

This fix adds supports for multiple k8s api servers specification,
load balance among api servers.

When two or more api servers are specified in kubernetes block (endpoint ...),
a proxy is created locally (with randomly generately port). The coredns
will points to the generated proxy so that load balancing could be achieved.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Setup initial healthcheck at the beginning

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update README.md for kubernetes middleware and remove whitespaces.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Use middleware/pkg/healthcheck in middleware/kubernetes

for api proxy

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-08-10 17:14:56 -07:00
Miek Gieben
acfa6501e0 mw/k8s: remove dependence on global var ()
* mw/k8s: remove dependence on global var

Remove the global coreDNSRecord that was used. Remove tests the
referenced that var. Cleanup the rest.

* Rename function as well

* fixes
2017-08-10 23:13:08 +01:00
Miek Gieben
c65fdb5fc3 kw/middleware: compress the README ()
Remove the examples, save one in the syntax section. The example
section covers all.

This brings the kubernetes README inline with other READMEs.
2017-08-10 22:47:09 +01:00
Miek Gieben
a38a34c7e0 Kubernetes cleanup6 ()
* mw/kubernetes: handle dns.TypeNS better.

* mw/kubernetes: cleanup typeNS replies a bit.
2017-08-10 22:14:19 +01:00
Miek Gieben
ea77f2a2ca core: replace GetMiddleware ()
* core: replace GetMiddleware

See the discussion in . GetMiddleware would add a `nil` middleware
to the callstack thereby breaking functionality.

This PR drops it in favor of RegisterHandler which is a completely
standalone registry for middleware that want to let it self know to
other middleware.

Currenly *autopath* uses this to call *kubernetes*'s AutoPath method
for dynamic autopathing.

* Drop GetMiddleware

* Register metrics

* drop the panic
2017-08-10 21:31:36 +01:00
Miek Gieben
10681c6bf0 mw/kubernetes: remove subzones ()
Only use was in k8s middleware; no tests other than subzone_test.go
existed; not exercised: remove.
2017-08-10 20:53:15 +01:00
Miek Gieben
4d0dae8deb middleware/autopath: some fixes ()
* middleware/autopath: some fixes

This fix a small issue in autopath, but unearthed a bigger one.
See .

* Fix test
2017-08-10 19:27:54 +01:00
Miek Gieben
6cc3f47d46 middleware/authpath: Fix return from k8s mw ()
* middleware/authpath: Fix return from k8s mw

Return the correct search path from the kubernetes' AutoPath function.
Based on preliminary discussion in 

* PodWithIP can be private

Fix and add docs to functions.

* CR: remove the error from AutoPathFunc
2017-08-10 19:26:31 +01:00
Miek Gieben
3654361be2 core: small cleanup ()
Add some docs about normalize.Host and normalize.Name. They are used
correctly in the middleware even though they are somewhat confusing,
esp when you copy from ServerBlockKeys in your middleware.
2017-08-10 05:30:18 -07:00
Miek Gieben
28447234b1 mw/kubernetes: fix parseTests ()
* mw/kubernetes: fix parseTests

Make parse tests table driven to remove a duplicate code, i.e. most
of the contents of parse_test.go can be removed as well as the
expectString helper function.

* cleanup parse tests
2017-08-10 02:23:27 -07:00
Miek Gieben
7e56cc74e5 WIP: Parserequest2 cutback ()
* middleware/kubernetes: pull TXT out of parseRequest

Put the TXT handling one layer higher and remove it from parseRequest.
Also rename the podsvc field in there to podOrSvc. Now that it isn't
used anymore for TXT record (dns-version) that was put in there. We can
make this a boolean (in a future PR).

Make parseRequest get an optional Zone that is from state.Zone and use
that instead of its own code. Removed some tests and other smaller
cleanups.

Fixes 

* add this reverse

* another check

* readd

* Rename to kPod and kService for some clarity
2017-08-10 01:08:58 -07:00
Yong Tang
fefc4374d7 Some go vet cleanup ()
Some `go vet` cleanup

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-08-09 11:00:03 -07:00
Yong Tang
a1b175ef78 Move Healthcheck to middleware/pkg/healthcheck ()
* Move healthcheck out

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Move healthcheck to middleware/pkg/healthcheck

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-08-09 09:21:33 -07:00
Miek Gieben
df1879f9ae middleware/kubernetes: put reverse function in own file ()
Move reverse function and (some) test code to reverse*.go
2017-08-09 05:18:46 -07:00
Miek Gieben
be037a32a5 mw/kubernetes: restore handler to pre-autopath state ()
Pull in the contents of routeRequest as it is only called once.
2017-08-09 04:09:37 -07:00