fix: protectedHandler OnDelete get tenant using client

projectcapsule · May 18, 2022 · 3c9228d · 3c9228d
1 parent bf6760f
commit 3c9228d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/e2e/tenant_protected_webhook_test.go b/e2e/tenant_protected_webhook_test.go
@@ -18,7 +18,7 @@ import (
 var _ = Describe("Deleting a tenant with protected annotation", func() {
 	tnt := &capsulev1beta1.Tenant{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "protected_tenant",
+			Name: "protected-tenant",
 			Annotations: map[string]string{
 				capsulev1beta1.ProtectedTenantAnnotation: "",
 			},

diff --git a/pkg/webhook/tenant/protected.go b/pkg/webhook/tenant/protected.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
@@ -28,10 +29,11 @@ func (h *protectedHandler) OnCreate(client.Client, *admission.Decoder, record.Ev
 	}
 }
 
-func (h *protectedHandler) OnDelete(_ client.Client, decoder *admission.Decoder, _ record.EventRecorder) capsulewebhook.Func {
+func (h *protectedHandler) OnDelete(clt client.Client, decoder *admission.Decoder, _ record.EventRecorder) capsulewebhook.Func {
 	return func(ctx context.Context, req admission.Request) *admission.Response {
 		tenant := &capsulev1beta1.Tenant{}
-		if err := decoder.Decode(req, tenant); err != nil {
+
+		if err := clt.Get(ctx, types.NamespacedName{Name: req.AdmissionRequest.Name}, tenant); err != nil {
 			return utils.ErroredResponse(err)
 		}