github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 13:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2097 from markturansky/v1beta3_podrefactor

Browse Source 
Refactor internal API for Pods to match v1beta3
This commit is contained in:
Clayton Coleman
2014-11-18 15:28:58 -05:00
parent 218c5fb93c 8af4ccb111
commit 1c524607d8
36 changed files with 569 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/e2e/e2e.go
View File

@@ -46,10 +46,10 @@ func waitForPodRunning(c *client.Client, id string) {
glog.Warningf("Get pod failed: %v", err)
continue
}
if pod.CurrentState.Status == api.PodRunning {
if pod.Status.Condition == api.PodRunning {
break
}
glog.Infof("Waiting for pod status to be running (%s)", pod.CurrentState.Status)
glog.Infof("Waiting for pod status to be running (%s)", pod.Status.Condition)
}
}
@@ -153,7 +153,7 @@ func TestPodUpdate(c *client.Client) bool {
value = "time" + value
pod.Labels["time"] = value
pod.ResourceVersion = podOut.ResourceVersion
pod.DesiredState.Manifest.UUID = podOut.DesiredState.Manifest.UUID
pod.UID = podOut.UID
pod, err = podClient.Update(pod)
if err != nil {
glog.Errorf("Failed to update pod: %v", err)