d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #872 from sargun/node-lease-controller

Browse Source
This commit is contained in:
Brian Goff
2020-08-17 12:38:27 -07:00
committed by GitHub
parent bad6076431 6845cf825a
commit 66ee454e1a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node/node.go
View File

@@ -424,7 +424,8 @@ func ensureLease(ctx context.Context, leases v1beta1.LeaseInterface, lease *coor
case errors.IsNotFound(err): case errors.IsNotFound(err):
log.G(ctx).WithError(err).Info("Node lease not supported") log.G(ctx).WithError(err).Info("Node lease not supported")
return nil, err return nil, err
case errors.IsAlreadyExists(err): case errors.IsAlreadyExists(err), errors.IsConflict(err):
log.G(ctx).WithError(err).Warn("Error creating lease, deleting and recreating")
if err := leases.Delete(ctx, lease.Name, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) { if err := leases.Delete(ctx, lease.Name, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) {
log.G(ctx).WithError(err).Error("could not delete old node lease") log.G(ctx).WithError(err).Error("could not delete old node lease")
return nil, pkgerrors.Wrap(err, "old lease exists but could not delete it") return nil, pkgerrors.Wrap(err, "old lease exists but could not delete it")