From acd54619023fcc6b5c2600a0d0015c23c6a20a68 Mon Sep 17 00:00:00 2001 From: Mario Constanti Date: Tue, 24 Oct 2023 17:05:14 +0200 Subject: [PATCH] feat: allow image deletion for deleted pools For pools with a deletion timestamp it's fine to not track this pool where the image is in use. Signed-off-by: Mario Constanti --- api/v1alpha1/image_webhook.go | 7 +++++-- api/v1alpha1/pool_webhook.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/v1alpha1/image_webhook.go b/api/v1alpha1/image_webhook.go index 172ea19a..033fbebf 100644 --- a/api/v1alpha1/image_webhook.go +++ b/api/v1alpha1/image_webhook.go @@ -66,8 +66,11 @@ func (i *Image) attachedPools(ctx context.Context) ([]Pool, error) { } for _, pool := range pools.Items { - if pool.Spec.ImageName == i.Name { - result = append(result, pool) + // we do not care about pools that are already deleted + if pool.GetDeletionTimestamp() == nil { + if pool.Spec.ImageName == i.Name { + result = append(result, pool) + } } } diff --git a/api/v1alpha1/pool_webhook.go b/api/v1alpha1/pool_webhook.go index 19fe1df3..12fbda15 100644 --- a/api/v1alpha1/pool_webhook.go +++ b/api/v1alpha1/pool_webhook.go @@ -77,7 +77,7 @@ func (r *Pool) ValidateCreate() (admission.Warnings, error) { if len(poolList.Items) > 0 { existing := poolList.Items[0] return nil, apierrors.NewBadRequest( - fmt.Sprintf("can not create pool, pool=%s with same image=%s , flavor=%s and provider=%s already exists for specified GitHubScope=%s", existing.Name, existing.Spec.ImageName, existing.Spec.Flavor, existing.Spec.ProviderName, existing.Spec.GitHubScopeRef.Name)) + fmt.Sprintf("can not create pool, pool=%s with same image=%s, flavor=%s and provider=%s already exists for specified GitHubScope=%s", existing.Name, existing.Spec.ImageName, existing.Spec.Flavor, existing.Spec.ProviderName, existing.Spec.GitHubScopeRef.Name)) } return nil, nil