upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-03-25 03:44:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(tiller): Fixes bug with --wait and updated deployments

Browse source 
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
This commit is contained in:
Taylor Thomas 2017-05-10 22:17:59 -07:00
parent a9f0be9bf3
commit d310612526
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/kube/wait.go
View file

@ -52,7 +52,6 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
pods := []v1.Pod{}
services := []v1.Service{}
pvc := []v1.PersistentVolumeClaim{}
replicaSets := []*extensions.ReplicaSet{}
deployments := []deployment{}
for _, v := range created {
obj, err := c.AsVersionedObject(v.Object)
@ -73,25 +72,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
}
pods = append(pods, *pod)
case (*extensions.Deployment):
// Get the RS children first
rs, err := client.Extensions().ReplicaSets(value.Namespace).List(metav1.ListOptions{
FieldSelector: fields.Everything().String(),
LabelSelector: labels.Set(value.Spec.Selector.MatchLabels).AsSelector().String(),
})
if err != nil {
return false, err
}
for _, i := range rs.Items {
replicaSets = append(replicaSets, &i)
}
currentDeployment, err := client.Extensions().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
if err != nil {
return false, err
}
// Find RS associated with deployment
newReplicaSet, err := deploymentutil.FindNewReplicaSet(currentDeployment, replicaSets)
newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, client)
if err != nil || newReplicaSet == nil {
return false, err
}