rewrite of static pod json zipper

- add busybox static pod to mesos-docker cluster
- customize static pods with binding annotations
- code cleanup
- removed hacky podtask.And func; support minimal resources for static pods when resource accounting is disabled
- removed zip archive of static pods, changed to gzip of PodList json
- pod utilities moved to package podutil
- added e2e test
- merge watched mirror pods into the mesos pod config stream

contrib/mesos/pkg/executor/service/service.go

@@ -42,12 +42,6 @@ import (
 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
 )
 
-const (
-	// if we don't use this source then the kubelet will do funny, mirror things.
-	// @see ConfigSourceAnnotationKey
-	MESOS_CFG_SOURCE = kubetypes.ApiserverSource
-)
-
 type KubeletExecutorServer struct {
 	*app.KubeletServer
 	SuicideTimeout    time.Duration
@@ -79,8 +73,14 @@ func (s *KubeletExecutorServer) AddFlags(fs *pflag.FlagSet) {
 	fs.DurationVar(&s.LaunchGracePeriod, "mesos-launch-grace-period", s.LaunchGracePeriod, "Launch grace period after which launching tasks will be cancelled. Zero disables launch cancellation.")
 }
 
-func (s *KubeletExecutorServer) runExecutor(execUpdates chan<- kubetypes.PodUpdate, nodeInfos chan<- executor.NodeInfo, kubeletFinished <-chan struct{},
-	staticPodsConfigPath string, apiclient *client.Client) error {
+func (s *KubeletExecutorServer) runExecutor(
+	execUpdates chan<- kubetypes.PodUpdate,
+	nodeInfos chan<- executor.NodeInfo,
+	kubeletFinished <-chan struct{},
+	staticPodsConfigPath string,
+	apiclient *client.Client,
+	podLW *cache.ListWatch,
+) error {
 	exec := executor.New(executor.Config{
 		Updates:         execUpdates,
 		APIClient:       apiclient,
@@ -111,10 +111,8 @@ func (s *KubeletExecutorServer) runExecutor(execUpdates chan<- kubetypes.PodUpda
 			return status, nil
 		},
 		StaticPodsConfigPath: staticPodsConfigPath,
-		PodLW: cache.NewListWatchFromClient(apiclient, "pods", api.NamespaceAll,
-			fields.OneTermEqualSelector(client.PodHost, s.HostnameOverride),
-		),
-		NodeInfos: nodeInfos,
+		PodLW:                podLW,
+		NodeInfos:            nodeInfos,
 	})
 
 	// initialize driver and initialize the executor with it
@@ -141,8 +139,14 @@ func (s *KubeletExecutorServer) runExecutor(execUpdates chan<- kubetypes.PodUpda
 	return nil
 }
 
-func (s *KubeletExecutorServer) runKubelet(execUpdates <-chan kubetypes.PodUpdate, nodeInfos <-chan executor.NodeInfo, kubeletDone chan<- struct{},
-	staticPodsConfigPath string, apiclient *client.Client) error {
+func (s *KubeletExecutorServer) runKubelet(
+	execUpdates <-chan kubetypes.PodUpdate,
+	nodeInfos <-chan executor.NodeInfo,
+	kubeletDone chan<- struct{},
+	staticPodsConfigPath string,
+	apiclient *client.Client,
+	podLW *cache.ListWatch,
+) error {
 	kcfg, err := s.UnsecuredKubeletConfig()
 	if err == nil {
 		// apply Messo specific settings
@@ -199,17 +203,8 @@ func (s *KubeletExecutorServer) runKubelet(execUpdates <-chan kubetypes.PodUpdat
 			}
 		}()
 
-		// create main pod source
-		updates := kcfg.PodConfig.Channel(MESOS_CFG_SOURCE)
-		go func() {
-			// execUpdates will be closed by the executor on shutdown
-			defer close(executorDone)
-
-			for u := range execUpdates {
-				u.Source = MESOS_CFG_SOURCE
-				updates <- u
-			}
-		}()
+		// create main pod source, it will close executorDone when the executor updates stop flowing
+		newSourceMesos(executorDone, execUpdates, kcfg.PodConfig.Channel(mesosSource), podLW)
 
 		// create static-pods directory file source
 		log.V(2).Infof("initializing static pods source factory, configured at path %q", staticPodsConfigPath)
@@ -257,14 +252,18 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
 		return fmt.Errorf("cannot create API client: %v", err)
 	}
 
+	pw := cache.NewListWatchFromClient(apiclient, "pods", api.NamespaceAll,
+		fields.OneTermEqualSelector(client.PodHost, s.HostnameOverride),
+	)
+
 	// start executor
-	err = s.runExecutor(execUpdates, nodeInfos, kubeletFinished, staticPodsConfigPath, apiclient)
+	err = s.runExecutor(execUpdates, nodeInfos, kubeletFinished, staticPodsConfigPath, apiclient, pw)
 	if err != nil {
 		return err
 	}
 
 	// start kubelet, blocking
-	return s.runKubelet(execUpdates, nodeInfos, kubeletFinished, staticPodsConfigPath, apiclient)
+	return s.runKubelet(execUpdates, nodeInfos, kubeletFinished, staticPodsConfigPath, apiclient, pw)
 }
 
 func defaultBindingAddress() string {