Merge pull request #104 from FabianKramm/master

improvement: improve create space logging

pkg/apiserver/registry/space/rest.go

@@ -265,7 +265,7 @@ func (r *spaceStorage) Create(ctx context.Context, obj runtime.Object, createVal
 	}
 
 	// print some log information
-	loghelper.Infof("create space %s for user %s: %v", space.Name, a.GetUser().GetName(), err)
+	loghelper.Infof("create space %s for user %s", space.Name, a.GetUser().GetName())
 
 	// Create the target namespace
 	namespace := ConvertSpace(space)
@@ -280,7 +280,7 @@ func (r *spaceStorage) Create(ctx context.Context, obj runtime.Object, createVal
 		}
 
 		// Create the default space templates and role binding
-		loghelper.Infof("initialize space %s for user %s: %v", namespace.Name, a.GetUser().GetName(), err)
+		loghelper.Infof("initialize space %s for user %s", namespace.Name, a.GetUser().GetName())
 		err = r.initializeSpace(ctx, namespace, account)
 		if err != nil {
 			// we have to use a background context here, because it might

pkg/manager/webhooks/quota.go

@@ -33,8 +33,7 @@ type QuotaValidator struct {
 	Log    logr.Logger
 	Scheme *runtime.Scheme
 
-	decoder *admission.Decoder
-
+	Decoder             *admission.Decoder
 	AdmissionController apiadmission.ValidationInterface
 }
 
@@ -48,7 +47,7 @@ func (v *QuotaValidator) Handle(ctx context.Context, req admission.Request) admi
 	}
 
 	// Convert request
-	attributes, err := NewAttributeFromRequest(req, v.decoder, v.Scheme)
+	attributes, err := NewAttributeFromRequest(req, v.Decoder, v.Scheme)
 	if err != nil {
 		return admission.Errored(1, err)
 	}
@@ -61,9 +60,3 @@ func (v *QuotaValidator) Handle(ctx context.Context, req admission.Request) admi
 
 	return admission.Allowed("")
 }
-
-// InjectDecoder injects the decoder.
-func (v *QuotaValidator) InjectDecoder(d *admission.Decoder) error {
-	v.decoder = d
-	return nil
-}

pkg/manager/webhooks/register.go

@@ -22,18 +22,24 @@ import (
 	"github.com/loft-sh/kiosk/pkg/util/encoding"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // Register registers the webhooks to the manager
 func Register(ctrlCtx *controllers.Context) error {
 	hookServer := ctrlCtx.Manager.GetWebhookServer()
+	admissionDecoder, err := admission.NewDecoder(ctrlCtx.Manager.GetScheme())
+	if err != nil {
+		return err
+	}
 
 	// Create the admission controller
 	admissionController := quota.NewAccountResourceQuota(ctrlCtx)
 	hookServer.Register("/quota", &webhook.Admission{Handler: &QuotaValidator{
 		Log:                 ctrl.Log.WithName("webhooks").WithName("Quota"),
 		Scheme:              ctrlCtx.Manager.GetScheme(),
 		AdmissionController: admissionController,
+		Decoder:             admissionDecoder,
 	}})
 
 	hookServer.Register("/validate", &webhook.Admission{Handler: &Validator{