github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21346 from janetkuo/delete-deployment-flake

Browse Source 
When reaping deployments, retry deployment Update
This commit is contained in:
Phillip Wittrock 2016-02-17 15:07:58 -08:00
commit 6435d03400
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/kubectl/stop.go
View File

@ -361,21 +361,17 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
replicaSets := reaper.Extensions().ReplicaSets(namespace) replicaSets := reaper.Extensions().ReplicaSets(namespace)
rsReaper, _ := ReaperFor(extensions.Kind("ReplicaSet"), reaper) rsReaper, _ := ReaperFor(extensions.Kind("ReplicaSet"), reaper)
deployment, err := deployments.Get(name) deployment, err := reaper.updateDeploymentWithRetries(namespace, name, func(d *extensions.Deployment) {
if err != nil { // set deployment's history and scale to 0
return err // TODO replace with patch when available: https://github.com/kubernetes/kubernetes/issues/20527
} zero := 0
d.Spec.RevisionHistoryLimit = &zero
// set deployment's history and scale to 0 d.Spec.Replicas = 0
// TODO replace with patch when available: https://github.com/kubernetes/kubernetes/issues/20527 // TODO: un-pausing should not be necessary, remove when this is fixed:
zero := 0 // https://github.com/kubernetes/kubernetes/issues/20966
deployment.Spec.RevisionHistoryLimit = &zero // Instead deployment should be Paused at this point and not at next TODO.
deployment.Spec.Replicas = 0 d.Spec.Paused = false
// TODO: un-pausing should not be necessary, remove when this is fixed: })
// https://github.com/kubernetes/kubernetes/issues/20966
// Instead deployment should be Paused at this point and not at next TODO.
deployment.Spec.Paused = false
deployment, err = deployments.Update(deployment)
if err != nil { if err != nil {
return err return err
} }
@ -441,6 +437,24 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
return deployments.Delete(name, gracePeriod) return deployments.Delete(name, gracePeriod)
} }
type updateDeploymentFunc func(d *extensions.Deployment)
func (reaper *DeploymentReaper) updateDeploymentWithRetries(namespace, name string, applyUpdate updateDeploymentFunc) (deployment *extensions.Deployment, err error) {
deployments := reaper.Extensions().Deployments(namespace)
err = wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) {
if deployment, err = deployments.Get(name); err != nil {
return false, err
}
// Apply the update, then attempt to push it to the apiserver.
applyUpdate(deployment)
if deployment, err = deployments.Update(deployment); err == nil {
return true, nil
}
return false, nil
})
return deployment, err
}
func (reaper *PodReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) error { func (reaper *PodReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) error {
pods := reaper.Pods(namespace) pods := reaper.Pods(namespace)
_, err := pods.Get(name) _, err := pods.Get(name)