Skip to content
This repository has been archived by the owner on Sep 21, 2023. It is now read-only.

Commit

Permalink
Merge pull request #168 from hongchaodeng/f
Browse files Browse the repository at this point in the history
operator: syncUpgrade should ignore notFound in Delete()
  • Loading branch information
hongchaodeng authored Oct 9, 2017
2 parents 45d2cea + eedd9a1 commit 2a2eaf8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/operator/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func (v *Vaults) syncUpgrade(vr *api.VaultService, d *appsv1beta1.Deployment) (e
// If it failed for some reason, kubelet will send SIGKILL after default grace period (30s) eventually.
// It take longer but the the lock will get released eventually on failure case.
err = v.kubecli.CoreV1().Pods(vr.Namespace).Delete(vr.Status.ActiveNode, nil)
if err != nil {
if err != nil && !apierrors.IsNotFound(err) {
return fmt.Errorf("step down: failed to delete active Vault pod (%s): %v", vr.Status.ActiveNode, err)
}
}
Expand Down

0 comments on commit 2a2eaf8

Please sign in to comment.