fix subnet validating webhook (#196)

* fix subnet validating webhook Signed-off-by: Artem Bortnikov <artem.bortnikov@telekom.com> * fix deletion timestamp check Signed-off-by: Artem Bortnikov <artem.bortnikov@telekom.com> * update ip validating webhook Signed-off-by: Artem Bortnikov <artem.bortnikov@telekom.com> --------- Signed-off-by: Artem Bortnikov <artem.bortnikov@telekom.com>
ironcore-dev · Jul 28, 2023 · 42fb256 · 42fb256
1 parent 4161a90
commit 42fb256
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/api/v1alpha1/ip_webhook.go b/api/v1alpha1/ip_webhook.go
@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	"context"
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	"github.com/pkg/errors"
@@ -138,10 +139,19 @@ func (in *IP) ValidateDelete() (admission.Warnings, error) {
 	}
 	ctx := context.Background()
 
-	if err := ipWebhookClient.Get(ctx, namespacedName, unstruct); !apierrors.IsNotFound(err) {
+	err = ipWebhookClient.Get(ctx, namespacedName, unstruct)
+	if !apierrors.IsNotFound(err) {
 		var allErrs field.ErrorList
-		allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, "Consumer is not deleted"))
-		return warnings, apierrors.NewInvalid(gvk.GroupKind(), in.Name, allErrs)
+		consumerUnstruct := unstruct.Object
+		deletionTimestamp, _, err := unstructured.NestedString(consumerUnstruct, "metadata", "deletionTimestamp")
+		switch {
+		case err != nil:
+			allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, err.Error()))
+			return warnings, apierrors.NewInvalid(gvk.GroupKind(), in.Name, allErrs)
+		case deletionTimestamp == "":
+			allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, "Consumer is not deleted"))
+			return warnings, apierrors.NewInvalid(gvk.GroupKind(), in.Name, allErrs)
+		}
 	}
 
 	return warnings, nil

diff --git a/api/v1alpha1/subnet_webhook.go b/api/v1alpha1/subnet_webhook.go
@@ -20,9 +20,10 @@ import (
 	"context"
 	"fmt"
 	"reflect"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 	"strings"
 
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -243,8 +244,16 @@ func (in *Subnet) ValidateDelete() (admission.Warnings, error) {
 		}
 		ctx := context.Background()
 
-		if err := subnetWebhookClient.Get(ctx, namespacedName, unstruct); !apierrors.IsNotFound(err) {
-			allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, "Consumer is not deleted"))
+		err = subnetWebhookClient.Get(ctx, namespacedName, unstruct)
+		if !apierrors.IsNotFound(err) {
+			consumerUnstruct := unstruct.Object
+			deletionTimestamp, _, err := unstructured.NestedString(consumerUnstruct, "metadata", "deletionTimestamp")
+			switch {
+			case err != nil:
+				allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, err.Error()))
+			case deletionTimestamp == "":
+				allErrs = append(allErrs, field.Invalid(field.NewPath("spec.consumer"), in.Spec.Consumer, "Consumer is not deleted"))
+			}
 		}
 	}