Use a helper bridge between k8s and SkyDNS

contrib/dns/README.md

@@ -38,11 +38,13 @@ sed -e "s/{DNS_SERVER_IP}/$DNS_SERVER_IP/g" \
 ```
 
 ## How does it work?
-SkyDNS depends on etcd, but it doesn't really need what etcd offers when in
-Kubernetes mode.  SkyDNS finds the Kubernetes master through the
-`kubernetes-ro` service, and pulls service info from it, essentially using
-etcd as a cache.  For simplicity, we run etcd and SkyDNS together in a pod,
-without linking the etcd instances into a cluster.
+SkyDNS depends on etcd for what to serve, but it doesn't really need all of
+what etcd offers in the way we use it.  For simplicty, we run etcd and SkyDNS
+together in a pod, and we do not try to link etcd instances across replicas.  A
+helper container called `kube2sky` also runs in the pod and acts a bridge
+between Kubernetes and SkyDNS.  It finds the Kubernetes master through the
+`kubernetes-ro` service, it pulls service info from the master, and it writes
+that to etcd for SkyDNS to find.
 
 ## Known issues
 DNS resolution does not work from nodes directly, but it DOES work for

contrib/dns/kube2sky/Dockerfile

+FROM scratch
+MAINTAINER Tim Hockin <thockin@google.com>
+ADD kube2sky kube2sky
+ADD kube2sky.go kube2sky.go
+ENTRYPOINT ["/kube2sky"]

contrib/dns/kube2sky/Makefile

+all: kube2sky
+
+kube2sky: kube2sky.go
+	CGO_ENABLED=0 go build -a --ldflags '-w' ./kube2sky.go
+
+container: kube2sky
+	sudo docker build -t kubernetes/kube2sky .
+
+push:
+	sudo docker push kubernetes/kube2sky
+
+clean:
+	rm -f kube2sky

contrib/dns/kube2sky/README.md

+# kube2sky
+==============
+
+A bridge between Kubernetes and SkyDNS.  This will watch the kubernetes API for
+changes in Services and then publish those changes to SkyDNS through etcd.
+
+For now, this is expected to be run in a pod alongside the etcd and SkyDNS
+containers.
+
+## Namespaces
+
+Kubernetes namespaces become another level of the DNS hierarchy.  See the
+description of `-domain` below.
+
+## Flags
+
+`-domain`: Set the domain under which all DNS names will be hosted.  For
+example, if this is set to `kubernetes.io`, then a service named "nifty" in the
+"default" namespace would be exposed through DNS as
+"nifty.default.kubernetes.io".
+
+`-verbose`: Log additional information.

contrib/dns/kube2sky/kube2sky.go

+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// kube2sky is a bridge between Kubernetes and SkyDNS.  It watches the
+// Kubernetes master for changes in Services and manifests them into etcd for
+// SkyDNS to serve as DNS records.
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	klabels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	kwatch "github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+	etcd "github.com/coreos/go-etcd/etcd"
+	skymsg "github.com/skynetservices/skydns/msg"
+)
+
+var (
+	domain  = flag.String("domain", "kubernetes.local", "domain under which to create names")
+	verbose = flag.Bool("verbose", false, "log extra information")
+)
+
+func removeDNS(record string, etcdClient *etcd.Client) error {
+	log.Printf("Removing %s from DNS", record)
+	_, err := etcdClient.Delete(skymsg.Path(record), true)
+	return err
+}
+
+func addDNS(record string, service *kapi.Service, etcdClient *etcd.Client) error {
+	svc := skymsg.Service{
+		Host:     service.Spec.PortalIP,
+		Port:     service.Spec.Port,
+		Priority: 10,
+		Weight:   10,
+		Ttl:      30,
+	}
+	b, err := json.Marshal(svc)
+	if err != nil {
+		return err
+	}
+	// Set with no TTL, and hope that kubernetes events are accurate.
+
+	log.Printf("Setting dns record: %v -> %s:%d\n", record, service.Spec.PortalIP, service.Spec.Port)
+	_, err = etcdClient.Set(skymsg.Path(record), string(b), uint64(0))
+	return err
+}
+
+func newEtcdClient() (client *etcd.Client) {
+	// TODO: take a flag for etcd server(s).
+	client = etcd.NewClient([]string{"http://127.0.0.1:4001"})
+	if client == nil {
+		return nil
+	}
+	client.SyncCluster()
+
+	return client
+}
+
+// TODO: evaluate using pkg/client/clientcmd
+func newKubeClient() (*kclient.Client, error) {
+	config := &kclient.Config{}
+
+	masterHost := os.Getenv("KUBERNETES_RO_SERVICE_HOST")
+	if masterHost == "" {
+		log.Fatalf("KUBERNETES_RO_SERVICE_HOST is not defined")
+	}
+	masterPort := os.Getenv("KUBERNETES_RO_SERVICE_PORT")
+	if masterPort == "" {
+		log.Fatalf("KUBERNETES_RO_SERVICE_PORT is not defined")
+	}
+	config.Host = fmt.Sprintf("http://%s:%s", masterHost, masterPort)
+	log.Printf("Using %s for kubernetes master", config.Host)
+
+	config.Version = "v1beta1"
+	log.Printf("Using kubernetes API %s", config.Version)
+
+	return kclient.New(config)
+}
+
+func buildNameString(service, namespace, domain string) string {
+	return fmt.Sprintf("%s.%s.%s.", service, namespace, domain)
+}
+
+func watchOnce(etcdClient *etcd.Client, kubeClient *kclient.Client) {
+	// Start the goroutine to produce update events.
+	updates := make(chan serviceUpdate)
+	startWatching(kubeClient.Services(kapi.NamespaceAll), updates)
+
+	// This loop will break if the channel closes, which is how the
+	// goroutine signals an error.
+	for ev := range updates {
+		if *verbose {
+			log.Printf("Received update event: %#v", ev)
+		}
+		switch ev.Op {
+		case SetServices, AddService:
+			for i := range ev.Services {
+				s := &ev.Services[i]
+				name := buildNameString(s.Name, s.Namespace, *domain)
+				err := addDNS(name, s, etcdClient)
+				if err != nil {
+					log.Printf("Failed to add DNS for %s: %v", name, err)
+				}
+			}
+		case RemoveService:
+			for i := range ev.Services {
+				s := &ev.Services[i]
+				name := buildNameString(s.Name, s.Namespace, *domain)
+				err := removeDNS(name, etcdClient)
+				if err != nil {
+					log.Printf("Failed to remove DNS for %s: %v", name, err)
+				}
+			}
+		}
+	}
+	//TODO: fully resync periodically.
+}
+
+func main() {
+	flag.Parse()
+
+	etcdClient := newEtcdClient()
+	if etcdClient == nil {
+		log.Fatal("Failed to create etcd client")
+	}
+
+	kubeClient, err := newKubeClient()
+	if err != nil {
+		log.Fatalf("Failed to create a kubernetes client: %v", err)
+	}
+
+	// In case of error, the watch will be aborted.  At that point we just
+	// retry.
+	for {
+		watchOnce(etcdClient, kubeClient)
+	}
+}
+
+//FIXME: make the below part of the k8s client lib?
+
+// servicesWatcher is capable of listing and watching for changes to services
+// across ALL namespaces
+type servicesWatcher interface {
+	List(label klabels.Selector) (*kapi.ServiceList, error)
+	Watch(label, field klabels.Selector, resourceVersion string) (kwatch.Interface, error)
+}
+
+type operation int
+
+// These are the available operation types.
+const (
+	SetServices operation = iota
+	AddService
+	RemoveService
+)
+
+// serviceUpdate describes an operation of services, sent on the channel.
+//
+// You can add or remove a single service by sending an array of size one with
+// Op == AddService|RemoveService.  For setting the state of the system to a given state, just
+// set Services as desired and Op to SetServices, which will reset the system
+// state to that specified in this operation for this source channel. To remove
+// all services, set Services to empty array and Op to SetServices
+type serviceUpdate struct {
+	Services []kapi.Service
+	Op       operation
+}
+
+// startWatching launches a goroutine that watches for changes to services.
+func startWatching(watcher servicesWatcher, updates chan<- serviceUpdate) {
+	serviceVersion := ""
+	go watchLoop(watcher, updates, &serviceVersion)
+}
+
+// watchLoop loops forever looking for changes to services.  If an error occurs
+// it will close the channel and return.
+func watchLoop(svcWatcher servicesWatcher, updates chan<- serviceUpdate, resourceVersion *string) {
+	defer close(updates)
+
+	if len(*resourceVersion) == 0 {
+		services, err := svcWatcher.List(klabels.Everything())
+		if err != nil {
+			log.Printf("Failed to load services: %v", err)
+			return
+		}
+		*resourceVersion = services.ResourceVersion
+		updates <- serviceUpdate{Op: SetServices, Services: services.Items}
+	}
+
+	watcher, err := svcWatcher.Watch(klabels.Everything(), klabels.Everything(), *resourceVersion)
+	if err != nil {
+		log.Printf("Failed to watch for service changes: %v", err)
+		return
+	}
+	defer watcher.Stop()
+
+	ch := watcher.ResultChan()
+	for {
+		select {
+		case event, ok := <-ch:
+			if !ok {
+				log.Printf("watchLoop channel closed")
+				return
+			}
+
+			if event.Type == kwatch.Error {
+				if status, ok := event.Object.(*kapi.Status); ok {
+					log.Printf("Error during watch: %#v", status)
+					return
+				}
+				log.Fatalf("Received unexpected error: %#v", event.Object)
+			}
+
+			if service, ok := event.Object.(*kapi.Service); ok {
+				sendUpdate(updates, event, service, resourceVersion)
+				continue
+			}
+		}
+	}
+}
+
+func sendUpdate(updates chan<- serviceUpdate, event kwatch.Event, service *kapi.Service, resourceVersion *string) {
+	*resourceVersion = service.ResourceVersion
+
+	switch event.Type {
+	case kwatch.Added, kwatch.Modified:
+		updates <- serviceUpdate{Op: AddService, Services: []kapi.Service{*service}}
+	case kwatch.Deleted:
+		updates <- serviceUpdate{Op: RemoveService, Services: []kapi.Service{*service}}
+	default:
+		log.Fatalf("Unknown event.Type: %v", event.Type)
+	}
+}

contrib/dns/skydns-rc.yaml.in

@@ -15,17 +15,25 @@ desiredState:
       manifest:
         version: v1beta2
         id: skydns
+        dnsPolicy: "Default"  # Don't use cluster DNS.
         containers:
           - name: etcd
             image: quay.io/coreos/etcd:latest
-            command: [ "/etcd", "-bind-addr=127.0.0.1" ]
-            ports:
-              - name: server
-                containerPort: 7001
+            command: [
+                    "/etcd",
+                    "-bind-addr=127.0.0.1",
+                    "-peer-bind-addr=127.0.0.1",
+            ]
+          - name: kube2sky
+            image: kubernetes/kube2sky:latest
+            command: [
+                    # entrypoint = "/kube2sky",
+                    "-domain={DNS_DOMAIN}",
+            ]
           - name: skydns
-            image: skynetservices/skydns:k8sfix
+            image: skynetservices/skydns:latest
             command: [
-                    "-kubernetes=true",
+                    # entrypoint = "/skydns",
                     "-machines=http://localhost:4001",
                     "-addr=0.0.0.0:53",
                     "-domain={DNS_DOMAIN}.",