github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #985 from brendandburns/kubecfg

Browse Source 
Make rolling update be blocking.
This commit is contained in:
Daniel Smith 2014-08-21 17:00:18 -07:00
commit 42685ad8f1
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubecfg/kubecfg.go
View File

@ -29,6 +29,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version" "github.com/GoogleCloudPlatform/kubernetes/pkg/version"
"github.com/golang/glog" "github.com/golang/glog"
"gopkg.in/v1/yaml" "gopkg.in/v1/yaml"
@ -93,6 +94,10 @@ func Update(name string, client client.Interface, updatePeriod time.Duration) er
if err != nil { if err != nil {
return err return err
} }
expected := len(podList.Items)
if expected == 0 {
return nil
}
for _, pod := range podList.Items { for _, pod := range podList.Items {
// We delete the pod here, the controller will recreate it. This will result in pulling // We delete the pod here, the controller will recreate it. This will result in pulling
// a new Docker image. This isn't a full "update" but it's what we support for now. // a new Docker image. This isn't a full "update" but it's what we support for now.
@ -102,7 +107,13 @@ func Update(name string, client client.Interface, updatePeriod time.Duration) er
} }
time.Sleep(updatePeriod) time.Sleep(updatePeriod)
} }
return nil return wait.Poll(time.Second*5, 60 /* timeout after 300 seconds */, func() (bool, error) {
podList, err := client.ListPods(s)
if err != nil {
return false, err
}
return len(podList.Items) == expected, nil
})
} }
// StopController stops a controller named 'name' by setting replicas to zero // StopController stops a controller named 'name' by setting replicas to zero

3
pkg/kubecfg/kubecfg_test.go
View File

@ -44,7 +44,7 @@ func TestUpdateWithPods(t *testing.T) {
}, },
} }
Update("foo", &fakeClient, 0) Update("foo", &fakeClient, 0)
if len(fakeClient.Actions) != 4 { if len(fakeClient.Actions) != 5 {
t.Errorf("Unexpected action list %#v", fakeClient.Actions) t.Errorf("Unexpected action list %#v", fakeClient.Actions)
} }
validateAction(client.FakeAction{Action: "get-controller", Value: "foo"}, fakeClient.Actions[0], t) validateAction(client.FakeAction{Action: "get-controller", Value: "foo"}, fakeClient.Actions[0], t)
@ -52,6 +52,7 @@ func TestUpdateWithPods(t *testing.T) {
// Update deletes the pods, it relies on the replication controller to replace them. // Update deletes the pods, it relies on the replication controller to replace them.
validateAction(client.FakeAction{Action: "delete-pod", Value: "pod-1"}, fakeClient.Actions[2], t) validateAction(client.FakeAction{Action: "delete-pod", Value: "pod-1"}, fakeClient.Actions[2], t)
validateAction(client.FakeAction{Action: "delete-pod", Value: "pod-2"}, fakeClient.Actions[3], t) validateAction(client.FakeAction{Action: "delete-pod", Value: "pod-2"}, fakeClient.Actions[3], t)
validateAction(client.FakeAction{Action: "list-pods"}, fakeClient.Actions[4], t)
} }
func TestUpdateNoPods(t *testing.T) { func TestUpdateNoPods(t *testing.T) {