github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #509 from xiangli-cmu/kubelet

Browse Source 
kubelet: cleanup
This commit is contained in:
Daniel Smith 2014-07-18 10:24:11 -07:00
commit e9dbc4e8ad
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/kubelet/kubelet.go
View File

@ -320,7 +320,6 @@ func (kl *Kubelet) extractFromDir(name string) ([]api.ContainerManifest, error)
for _, file := range files { for _, file := range files {
manifest, err := kl.extractFromFile(file) manifest, err := kl.extractFromFile(file)
if err != nil { if err != nil {
glog.Errorf("Couldn't read from file %s: %v", file, err)
return manifests, err return manifests, err
} }
manifests = append(manifests, manifest) manifests = append(manifests, manifest)
@ -331,8 +330,6 @@ func (kl *Kubelet) extractFromDir(name string) ([]api.ContainerManifest, error)
// WatchFiles watches a file or direcory of files for changes to the set of pods that // WatchFiles watches a file or direcory of files for changes to the set of pods that
// should run on this Kubelet. // should run on this Kubelet.
func (kl *Kubelet) WatchFiles(configPath string, updateChannel chan<- manifestUpdate) { func (kl *Kubelet) WatchFiles(configPath string, updateChannel chan<- manifestUpdate) {
var err error
statInfo, err := os.Stat(configPath) statInfo, err := os.Stat(configPath)
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
@ -340,37 +337,34 @@ func (kl *Kubelet) WatchFiles(configPath string, updateChannel chan<- manifestUp
} }
return return
} }
if statInfo.Mode().IsDir() {
switch {
case statInfo.Mode().IsDir():
manifests, err := kl.extractFromDir(configPath) manifests, err := kl.extractFromDir(configPath)
if err != nil { if err != nil {
glog.Errorf("Error polling dir: %v", err) glog.Errorf("Error polling dir: %v", err)
return return
} }
updateChannel <- manifestUpdate{fileSource, manifests} updateChannel <- manifestUpdate{fileSource, manifests}
} else if statInfo.Mode().IsRegular() { case statInfo.Mode().IsRegular():
manifest, err := kl.extractFromFile(configPath) manifest, err := kl.extractFromFile(configPath)
if err != nil { if err != nil {
glog.Errorf("Error polling file: %v", err) glog.Errorf("Error polling file: %v", err)
return return
} }
updateChannel <- manifestUpdate{fileSource, []api.ContainerManifest{manifest}} updateChannel <- manifestUpdate{fileSource, []api.ContainerManifest{manifest}}
} else { default:
glog.Errorf("Error accessing config - not a directory or file") glog.Errorf("Error accessing config - not a directory or file")
return
} }
} }
func (kl *Kubelet) extractFromHTTP(url string, updateChannel chan<- manifestUpdate) error { func (kl *Kubelet) extractFromHTTP(url string, updateChannel chan<- manifestUpdate) error {
request, err := http.NewRequest("GET", url, nil) resp, err := http.Get(url)
if err != nil { if err != nil {
return err return err
} }
response, err := http.DefaultClient.Do(request) defer resp.Body.Close()
if err != nil { data, err := ioutil.ReadAll(resp.Body)
return err
}
defer response.Body.Close()
data, err := ioutil.ReadAll(response.Body)
if err != nil { if err != nil {
return err return err
} }
@ -483,8 +477,7 @@ func (kl *Kubelet) TimeoutWatch(done chan bool) {
// ExtractYAMLData extracts data from YAML file into a list of containers. // ExtractYAMLData extracts data from YAML file into a list of containers.
func (kl *Kubelet) ExtractYAMLData(buf []byte, output interface{}) error { func (kl *Kubelet) ExtractYAMLData(buf []byte, output interface{}) error {
err := yaml.Unmarshal(buf, output) if err := yaml.Unmarshal(buf, output); err != nil {
if err != nil {
glog.Errorf("Couldn't unmarshal configuration: %v", err) glog.Errorf("Couldn't unmarshal configuration: %v", err)
return err return err
} }