Merge pull request #6352 from piosz/api

Removed PodStatus.Host
This commit is contained in:
Brian Grant
2015-04-02 13:16:24 -07:00
31 changed files with 149 additions and 199 deletions

View File

@@ -288,7 +288,7 @@ func (factory *ConfigFactory) makeDefaultErrorFunc(backoff *podBackoff, podQueue
glog.Errorf("Error getting pod %v for retry: %v; abandoning", podID, err)
return
}
if pod.Status.Host == "" {
if pod.Spec.Host == "" {
podQueue.Add(pod)
}
}()

View File

@@ -140,7 +140,6 @@ func (s *Scheduler) scheduleOne() {
// tell the model to assume that this binding took effect.
assumed := *pod
assumed.Spec.Host = dest
assumed.Status.Host = dest
s.config.Modeler.AssumePod(&assumed)
})
}

View File

@@ -40,9 +40,6 @@ func podWithID(id, desiredHost string) *api.Pod {
Spec: api.PodSpec{
Host: desiredHost,
},
Status: api.PodStatus{
Host: desiredHost,
},
}
}