Merge pull request #19 from mercedes-benz/decouple_image_to_pool_depe…

…ndency feat: allow image deletion for deleted pools
mercedes-benz · Oct 24, 2023 · 4a27765 · 4a27765
2 parents cf3cea0 + acd5461
commit 4a27765
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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