2 files changed, 94 insertions, 0 deletions

diff --git a/core/directives.go b/core/directives.go
index 3de69f8fb..63e245578 100644
--- a/core/directives.go
+++ b/core/directives.go
@@ -65,6 +65,7 @@ var directiveOrder = []directive{
 	{"file", setup.File},
 	{"secondary", setup.Secondary},
 	{"etcd", setup.Etcd},
+	{"kubernetes", setup.Kubernetes},
 	{"proxy", setup.Proxy},
 }
 
diff --git a/core/setup/kubernetes.go b/core/setup/kubernetes.go
new file mode 100644
index 000000000..8f21286f5
--- /dev/null
+++ b/core/setup/kubernetes.go
@@ -0,0 +1,93 @@
+package setup
+
+import (
+//	"crypto/tls"
+//	"crypto/x509"
+    "fmt"
+//	"io/ioutil"
+//	"net"
+//	"net/http"
+//	"time"
+
+	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/kubernetes"
+	k8sc "github.com/miekg/coredns/middleware/kubernetes/k8sclient"
+	"github.com/miekg/coredns/middleware/proxy"
+//	"github.com/miekg/coredns/middleware/singleflight"
+
+	"golang.org/x/net/context"
+)
+
+const defaultK8sEndpoint = "http://localhost:8080"
+
+// Kubernetes sets up the kubernetes middleware.
+func Kubernetes(c *Controller) (middleware.Middleware, error) {
+    fmt.Println("controller %v", c)
+    // TODO: Determine if subzone support required
+
+	kubernetes, err := kubernetesParse(c)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return func(next middleware.Handler) middleware.Handler {
+		kubernetes.Next = next
+		return kubernetes
+	}, nil
+}
+
+func kubernetesParse(c *Controller) (kubernetes.Kubernetes, error) {
+
+    /*
+     * TODO: Remove unused state and simplify.
+     * Inflight and Ctx might not be needed. Leaving in place until
+     * we take a pass at API caching and optimizing connector to the
+     * k8s API. Single flight (or limited upper-bound) for inflight 
+     * API calls may be desirable.
+     */ 
+
+	k8s := kubernetes.Kubernetes{
+        Proxy:      proxy.New([]string{}),
+		Ctx:        context.Background(),
+//		Inflight:   &singleflight.Group{},
+        APIConn:    nil,
+	}
+	var (
+		endpoints     = []string{defaultK8sEndpoint}
+	)
+	for c.Next() {
+		if c.Val() == "kubernetes" {
+			k8s.Zones = c.RemainingArgs()
+			if len(k8s.Zones) == 0 {
+				k8s.Zones = c.ServerBlockHosts
+			}
+			middleware.Zones(k8s.Zones).FullyQualify()
+			if c.NextBlock() {
+				// TODO(miek): 2 switches?
+				switch c.Val() {
+				case "endpoint":
+					args := c.RemainingArgs()
+					if len(args) == 0 {
+						return kubernetes.Kubernetes{}, c.ArgErr()
+					}
+					endpoints = args
+                    k8s.APIConn = k8sc.NewK8sConnector(endpoints[0])
+				}
+				for c.Next() {
+					switch c.Val() {
+					case "endpoint":
+						args := c.RemainingArgs()
+						if len(args) == 0 {
+							return kubernetes.Kubernetes{}, c.ArgErr()
+						}
+						endpoints = args
+					}
+				}
+			}
+			return k8s, nil
+		}
+        fmt.Println("endpoints='%v'", endpoints)
+	}
+	return kubernetes.Kubernetes{}, nil
+}