Merge pull request kubernetes#239 from jjhuff/dead_code

Remove extractMultipleFromReader and extractSingleFromReader.
duda · Jun 25, 2014 · b2a7d19 · b2a7d19
2 parents c3da356 + ddf0fd1
commit b2a7d19
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -19,7 +19,6 @@ package kubelet
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"log"
 	"math/rand"
@@ -442,32 +441,6 @@ func (kl *Kubelet) extractFromDir(name string) ([]api.ContainerManifest, error)
 	return manifests, nil
 }
 
-func (kl *Kubelet) extractMultipleFromReader(reader io.Reader) ([]api.ContainerManifest, error) {
-	var manifests []api.ContainerManifest
-	data, err := ioutil.ReadAll(reader)
-	if err != nil {
-		log.Printf("Couldn't read from reader: %v", err)
-		return manifests, err
-	}
-	if err = kl.ExtractYAMLData(data, &manifests); err != nil {
-		return manifests, err
-	}
-	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 or direcory of files for changes to the set of pods that
 // should run on this Kubelet.
 func (kl *Kubelet) WatchFiles(config_path string, updateChannel chan<- manifestUpdate) {