mirror of
https://github.com/storytold/irsa-manager.git
synced 2026-10-23 08:05:25 +00:00
fix delete, test
This commit is contained in:
@@ -157,11 +157,14 @@ func (a *AwsS3Client) DeleteBucket(ctx context.Context) error {
|
|||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var ae smithy.APIError
|
var ae smithy.APIError
|
||||||
|
var nfe *s3types.NoSuchBucket
|
||||||
if errors.As(err, &ae) && ae.ErrorCode() == "BucketNotEmpty" {
|
if errors.As(err, &ae) && ae.ErrorCode() == "BucketNotEmpty" {
|
||||||
log.Println("skipped error", err)
|
log.Println("skipped error", err)
|
||||||
} else {
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
if errors.As(err, &nfe) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,11 +63,13 @@ func (r *IRSASetupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
|
|||||||
if err := r.Get(ctx, req.NamespacedName, obj); err != nil {
|
if err := r.Get(ctx, req.NamespacedName, obj); err != nil {
|
||||||
return ctrl.Result{}, client.IgnoreNotFound(err)
|
return ctrl.Result{}, client.IgnoreNotFound(err)
|
||||||
}
|
}
|
||||||
awsClient, err := awsclient.NewAwsClientFactory(ctx)
|
if r.AwsClient == nil {
|
||||||
if err != nil {
|
awsClient, err := awsclient.NewAwsClientFactory(ctx)
|
||||||
return ctrl.Result{}, err
|
if err != nil {
|
||||||
|
return ctrl.Result{}, err
|
||||||
|
}
|
||||||
|
r.AwsClient = awsClient
|
||||||
}
|
}
|
||||||
r.AwsClient = awsClient
|
|
||||||
kubeClient, err := kubernetes.NewKubernetesClient(r.Client, kubernetes.Owner{Field: "irsa-manager"})
|
kubeClient, err := kubernetes.NewKubernetesClient(r.Client, kubernetes.Owner{Field: "irsa-manager"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ctrl.Result{}, err
|
return ctrl.Result{}, err
|
||||||
@@ -123,8 +125,7 @@ func (r *IRSASetupReconciler) reconcileDelete(ctx context.Context, obj *irsav1al
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
controllerutil.RemoveFinalizer(obj, irsamanagerFinalizer)
|
controllerutil.RemoveFinalizer(obj, irsamanagerFinalizer)
|
||||||
|
return r.Update(ctx, obj)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// reconcileSelfhosted ensures that the self-hosted resources are set up correctly.
|
// reconcileSelfhosted ensures that the self-hosted resources are set up correctly.
|
||||||
|
|||||||
Reference in New Issue
Block a user