Merge branch 'cleanup-for-release'

conf/chaosCorefile

@@ -1,4 +0,0 @@
-.:1053 authors.bind:1053 {
-    chaos CoreDNS-001 "Miek Gieben" miek@miek.nl
-    proxy . 8.8.8.8:53
-}

conf/etcdCorefile

@@ -1,10 +0,0 @@
-.:1053 {
-    etcd skydns.local {
-        stubzones
-        path /skydns
-        endpoint http://localhost:2379
-        upstream 8.8.8.8:53 8.8.4.4:53
-        debug
-    }
-    proxy . 8.8.8.8:53
-}

conf/k8sCorefile

@@ -1,25 +0,0 @@
-# Serve on port 53
-.:53 {
-    # use kubernetes middleware for domain "coredns.local"
-    kubernetes coredns.local {
-		# Kubernetes data API resync period
-		# Example values: 60s, 5m, 1h
-		resyncperiod 5m
-        # Use url for k8s API endpoint
-        endpoint http://localhost:8080
-        # Assemble k8s record names with the template
-        template {service}.{namespace}.{zone}
-        # Only expose the k8s namespace "demo"
-        namespaces demo
-        # Only expose the records for kubernetes objects
-        # that matches this label selector. The label
-        # selector syntax is described in the kubernetes
-        # API documentation: http://kubernetes.io/docs/user-guide/labels/
-        # Example selector below only exposes objects tagged as
-        # "application=nginx" in the staging or qa environments.
-        #labels environment in (staging, qa),application=nginx
-    }
-    # Perform DNS response caching for the coredns.local zone
-    # Cache timeout is provided by the integer in seconds
-    #cache 180 coredns.local
-}

middleware/kubernetes/README.md

@@ -117,14 +117,34 @@ with services running in those namespaces. The automated kubernetes integration
 
 #### Launch CoreDNS
 
-Build CoreDNS and launch using the configuration file in `conf/k8sCorefile`.
-This configuration file sets up CoreDNS to use the zone `coredns.local` for
-the kubernetes services.
+Build CoreDNS and launch using this configuration file:
+
+~~~ txt
+# Serve on port 53
+.:53 {
+    kubernetes coredns.local {
+		resyncperiod 5m
+        endpoint http://localhost:8080
+        template {service}.{namespace}.{zone}
+        namespaces demo
+        # Only expose the records for kubernetes objects
+        # that matches this label selector. 
+        # See http://kubernetes.io/docs/user-guide/labels/
+        # Example selector below only exposes objects tagged as
+        # "application=nginx" in the staging or qa environments.
+        #labels environment in (staging, qa),application=nginx
+    }
+    #cache 180 coredns.local # optionally enable caching
+}
+~~~
+
+Put it in `~/k8sCorefile` for instance. This configuration file sets up CoreDNS to use the zone
+`coredns.local` for the kubernetes services.
 
 The command to launch CoreDNS is:
 
 ~~~
-$ ./coredns -conf conf/k8sCoreFile
+$ ./coredns -conf ~/k8sCorefile
 ~~~
 
 In a separate terminal a DNS query can be issued using dig: