Skip to content

Commit 79c492b

Browse files
thomastaylor312adamreese
authored andcommitted
fix(tiller): Fixes bug with --wait and updated deployments
The current methodology generated its own RS slice instead of using a helper method that uses a `clientset`. This caused some issues where `FindNewReplicaSet` always returned `nil`. This switches the method and removes some unneeded API calls and code. Closes #2426
1 parent 46d9ea8 commit 79c492b

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

pkg/kube/wait.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
5252
pods := []v1.Pod{}
5353
services := []v1.Service{}
5454
pvc := []v1.PersistentVolumeClaim{}
55-
replicaSets := []*extensions.ReplicaSet{}
5655
deployments := []deployment{}
5756
for _, v := range created {
5857
obj, err := c.AsVersionedObject(v.Object)
@@ -73,25 +72,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
7372
}
7473
pods = append(pods, *pod)
7574
case (*extensions.Deployment):
76-
// Get the RS children first
77-
rs, err := client.Extensions().ReplicaSets(value.Namespace).List(metav1.ListOptions{
78-
FieldSelector: fields.Everything().String(),
79-
LabelSelector: labels.Set(value.Spec.Selector.MatchLabels).AsSelector().String(),
80-
})
81-
if err != nil {
82-
return false, err
83-
}
84-
85-
for _, i := range rs.Items {
86-
replicaSets = append(replicaSets, &i)
87-
}
88-
8975
currentDeployment, err := client.Extensions().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
9076
if err != nil {
9177
return false, err
9278
}
9379
// Find RS associated with deployment
94-
newReplicaSet, err := deploymentutil.FindNewReplicaSet(currentDeployment, replicaSets)
80+
newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, client)
9581
if err != nil || newReplicaSet == nil {
9682
return false, err
9783
}

0 commit comments

Comments
 (0)