mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 18:27:36 +00:00
fix: edge case delete fails
This commit is contained in:
@@ -65,6 +65,8 @@ func (r *InfisicalPushSecretReconciler) Reconcile(ctx context.Context, req ctrl.
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.IsNotFound(err) {
|
if errors.IsNotFound(err) {
|
||||||
logger.Info("Infisical Push Secret CRD not found")
|
logger.Info("Infisical Push Secret CRD not found")
|
||||||
|
r.DeleteManagedSecrets(ctx, logger, infisicalPushSecretCRD)
|
||||||
|
|
||||||
return ctrl.Result{
|
return ctrl.Result{
|
||||||
Requeue: false,
|
Requeue: false,
|
||||||
}, nil
|
}, nil
|
||||||
|
|||||||
@@ -486,9 +486,28 @@ func (r *InfisicalPushSecretReconciler) DeleteManagedSecrets(ctx context.Context
|
|||||||
|
|
||||||
resourceVariables := r.getResourceVariables(infisicalPushSecret)
|
resourceVariables := r.getResourceVariables(infisicalPushSecret)
|
||||||
infisicalClient := resourceVariables.InfisicalClient
|
infisicalClient := resourceVariables.InfisicalClient
|
||||||
|
cancelCtx := resourceVariables.CancelCtx
|
||||||
|
authDetails := resourceVariables.AuthDetails
|
||||||
|
var err error
|
||||||
|
|
||||||
|
if authDetails.AuthStrategy == "" {
|
||||||
|
logger.Info("No authentication strategy found. Attempting to authenticate")
|
||||||
|
authDetails, err = r.handleAuthentication(ctx, infisicalPushSecret, infisicalClient)
|
||||||
|
r.SetAuthenticatedStatusCondition(ctx, &infisicalPushSecret, err)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("unable to authenticate [err=%s]", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
r.updateResourceVariables(infisicalPushSecret, util.ResourceVariables{
|
||||||
|
InfisicalClient: infisicalClient,
|
||||||
|
CancelCtx: cancelCtx,
|
||||||
|
AuthDetails: authDetails,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
destination := infisicalPushSecret.Spec.Destination
|
destination := infisicalPushSecret.Spec.Destination
|
||||||
existingSecrets, err := infisicalClient.Secrets().List(infisicalSdk.ListSecretsOptions{
|
existingSecrets, err := resourceVariables.InfisicalClient.Secrets().List(infisicalSdk.ListSecretsOptions{
|
||||||
ProjectID: destination.ProjectID,
|
ProjectID: destination.ProjectID,
|
||||||
Environment: destination.EnvironmentSlug,
|
Environment: destination.EnvironmentSlug,
|
||||||
SecretPath: destination.SecretsPath,
|
SecretPath: destination.SecretsPath,
|
||||||
|
|||||||
Reference in New Issue
Block a user