From 77af24e7dc16238cb32a450bf9af762f1a50fd69 Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Mon, 23 Jun 2014 15:06:28 -0700
Subject: [PATCH] manifest_url needs to take a single ContainerManifest.

---
 pkg/kubelet/kubelet.go      | 79 ++++++++++++++++++-------------------
 pkg/kubelet/kubelet_test.go |  4 +-
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index f7ac1d206c8..101af50460f 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -94,10 +94,14 @@ const (
 func (kl *Kubelet) RunKubelet(file, manifest_url, etcd_servers, address string, port uint) {
 	updateChannel := make(chan manifestUpdate)
 	if file != "" {
-		go util.Forever(func() { kl.WatchFile(file, updateChannel) }, 20*time.Second)
+		go util.Forever(func() { kl.WatchFile(file, updateChannel) }, kl.FileCheckFrequency)
 	}
 	if manifest_url != "" {
-		go util.Forever(func() { kl.WatchHTTP(manifest_url, updateChannel) }, 20*time.Second)
+		go util.Forever(func() {
+			if err := kl.extractFromHTTP(manifest_url, updateChannel); err != nil {
+				log.Printf("Error syncing http: %#v", err)
+			}
+		}, kl.HTTPCheckFrequency)
 	}
 	if etcd_servers != "" {
 		servers := []string{etcd_servers}
@@ -434,69 +438,64 @@ func (kl *Kubelet) extractMultipleFromReader(reader io.Reader) ([]api.ContainerM
 	return manifests, nil
 }
 
+func (kl *Kubelet) extractSingleFromReader(reader io.Reader) (api.ContainerManifest, error) {
+	var manifest api.ContainerManifest
+	data, err := ioutil.ReadAll(reader)
+	if err != nil {
+		log.Printf("Couldn't read from reader: %v", err)
+		return manifest, err
+	}
+	if err = kl.ExtractYAMLData(data, &manifest); err != nil {
+		return manifest, err
+	}
+	return manifest, nil
+}
+
 // Watch a file for changes to the set of pods that should run on this Kubelet
 // This function loops forever and is intended to be run as a goroutine
 func (kl *Kubelet) WatchFile(file string, updateChannel chan<- manifestUpdate) {
-	for {
-		var err error
+	var err error
 
-		time.Sleep(kl.FileCheckFrequency)
-
-		fileInfo, err := os.Stat(file)
+	fileInfo, err := os.Stat(file)
+	if err != nil {
+		log.Printf("Error polling file: %#v", err)
+		return
+	}
+	if fileInfo.IsDir() {
+		manifests, err := kl.extractFromDir(file)
+		if err != nil {
+			log.Printf("Error polling dir: %#v", err)
+			return
+		}
+		updateChannel <- manifestUpdate{fileSource, manifests}
+	} else {
+		manifest, err := kl.extractFromFile(file)
 		if err != nil {
 			log.Printf("Error polling file: %#v", err)
-			continue
-		}
-		if fileInfo.IsDir() {
-			manifests, err := kl.extractFromDir(file)
-			if err != nil {
-				log.Printf("Error polling dir: %#v", err)
-				continue
-			}
-			updateChannel <- manifestUpdate{fileSource, manifests}
-		} else {
-			manifest, err := kl.extractFromFile(file)
-			if err != nil {
-				log.Printf("Error polling file: %#v", err)
-				continue
-			}
-			updateChannel <- manifestUpdate{fileSource, []api.ContainerManifest{manifest}}
+			return
 		}
+		updateChannel <- manifestUpdate{fileSource, []api.ContainerManifest{manifest}}
 	}
 }
 
 func (kl *Kubelet) extractFromHTTP(url string, updateChannel chan<- manifestUpdate) error {
-	client := &http.Client{}
 	request, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return err
 	}
-	response, err := client.Do(request)
+	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return err
 	}
 	defer response.Body.Close()
-	manifests, err := kl.extractMultipleFromReader(response.Body)
+	manifest, err := kl.extractSingleFromReader(response.Body)
 	if err != nil {
 		return err
 	}
-	updateChannel <- manifestUpdate{httpClientSource, manifests}
+	updateChannel <- manifestUpdate{httpClientSource, []api.ContainerManifest{manifest}}
 	return nil
 }
 
-// Watch an HTTP endpoint for changes to the set of pods that should run on this Kubelet
-// This function runs forever and is intended to be run as a goroutine
-func (kl *Kubelet) WatchHTTP(url string, updateChannel chan<- manifestUpdate) {
-	for {
-		var err error
-		time.Sleep(kl.HTTPCheckFrequency)
-		err = kl.extractFromHTTP(url, updateChannel)
-		if err != nil {
-			log.Printf("Error syncing http: %#v", err)
-		}
-	}
-}
-
 // Take an etcd Response object, and turn it into a structured list of containers
 // Return a list of containers, or an error if one occurs.
 func (kl *Kubelet) ResponseToManifests(response *etcd.Response) ([]api.ContainerManifest, error) {
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 14e242d3d34..fe8cf7e30ea 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -835,7 +835,9 @@ func TestExtractFromHttp(t *testing.T) {
 	manifests := []api.ContainerManifest{
 		{Id: "foo"},
 	}
-	data, err := json.Marshal(manifests)
+	// TODO: provide a mechanism for taking arrays of
+	// manifests or a single manifest.
+	data, err := json.Marshal(manifests[0])
 
 	fakeHandler := util.FakeHandler{
 		StatusCode:   200,