Skip to content

Commit

Permalink
fix: add requeue on delete secret error
Browse files Browse the repository at this point in the history
also prevents adding finalizer if generated secret has been deleted.
  • Loading branch information
ikadix committed Jul 25, 2023
1 parent 82d8078 commit 4df160b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions internal/controller/generatedsecret_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ package controller

import (
"context"
"encoding/pem"
"fmt"

"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/x509"
"encoding/pem"
"fmt"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -51,7 +50,7 @@ func (r *GeneratedSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
// Next, let's add a finalizer to our object if we don't have one because
// we don't want this to be deleted until we've also tidied up the secret
// if that was desirable.
if !controllerutil.ContainsFinalizer(&generatedSecret, finalizerName) {
if !controllerutil.ContainsFinalizer(&generatedSecret, finalizerName) && generatedSecret.ObjectMeta.DeletionTimestamp.IsZero() {
log.Info("adding finalizer to GeneratedSecret")
controllerutil.AddFinalizer(&generatedSecret, finalizerName)
if err := r.Update(ctx, &generatedSecret); err != nil {
Expand Down Expand Up @@ -96,7 +95,9 @@ func (r *GeneratedSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
log.Info("secret is aleady deleted")
} else if err != nil {
log.Error(err, "unable to delete Secret")
return ctrl.Result{}, err
return ctrl.Result{
Requeue: true,
}, err
} else {
log.Info("deleted secret")
}
Expand Down

0 comments on commit 4df160b

Please sign in to comment.