Skip to content

Fix ComposabilityRequest webhook validator for controller-runtime API #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hase1128 merged 2 commits into from
Jul 10, 2026
+12 −28
Merged

Fix ComposabilityRequest webhook validator for controller-runtime API #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10ef9ff
fix: use typed validator for composability requests
NekoHK Jul 10, 2026
bf7dde9
ci: update controller-tools for Go 1.26
NekoHK Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint

## Tool Versions
KUSTOMIZE_VERSION ?= v5.4.3
CONTROLLER_TOOLS_VERSION ?= v0.16.1
CONTROLLER_TOOLS_VERSION ?= v0.21.0
ENVTEST_VERSION ?= release-0.19
GOLANGCI_LINT_VERSION ?= v1.59.1

Expand Down
38 changes: 11 additions & 27 deletions internal/webhook/v1alpha1/composabilityrequest_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ import (
"context"
"fmt"

"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

crov1alpha1 "github.com/CoHDI/composable-resource-operator/api/v1alpha1"
Expand All @@ -36,7 +34,7 @@ var composabilityRequestWebhookLog = logf.Log.WithName("composabilityrequest-web

// SetupComposabilityRequestWebhookWithManager registers the webhook for ComposabilityRequest in the manager.
func SetupWebhookWithManager(mgr ctrl.Manager) error {
return ctrl.NewWebhookManagedBy(mgr).For(&crov1alpha1.ComposabilityRequest{}).
return ctrl.NewWebhookManagedBy(mgr, &crov1alpha1.ComposabilityRequest{}).
WithValidator(&ComposabilityRequestCustomValidator{
Client: mgr.GetClient(),
}).
Expand All @@ -62,42 +60,28 @@ type ComposabilityRequestCustomValidator struct {
client.Client
}

var _ webhook.CustomValidator = &ComposabilityRequestCustomValidator{}

// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (warnings admission.Warnings, err error) {
composabilityrequest, ok := obj.(*crov1alpha1.ComposabilityRequest)
if !ok {
err := fmt.Errorf("expected a ComposabilityRequest object but got %T", obj)
composabilityRequestWebhookLog.Error(err, "failed to get a ComposabilityRequest object", "obj", obj)
return nil, err
}
var _ admission.Validator[*crov1alpha1.ComposabilityRequest] = &ComposabilityRequestCustomValidator{}

// ValidateCreate implements admission.Validator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateCreate(ctx context.Context, composabilityrequest *crov1alpha1.ComposabilityRequest) (warnings admission.Warnings, err error) {
composabilityRequestWebhookLog.Info("validation for ComposabilityRequest upon creation", "name", composabilityrequest.GetName())

return validateRequest(v, composabilityrequest, ctx, obj)
return validateRequest(v, composabilityrequest, ctx)
}

// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateUpdate(ctx context.Context, oldObj runtime.Object, newObj runtime.Object) (warnings admission.Warnings, err error) {
newComposabilityRequest, ok := newObj.(*crov1alpha1.ComposabilityRequest)
if !ok {
err := fmt.Errorf("expected a ComposabilityRequest object but got %T", newObj)
composabilityRequestWebhookLog.Error(err, "failed to get a ComposabilityRequest object", "obj", newObj)
return nil, err
}

// ValidateUpdate implements admission.Validator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateUpdate(ctx context.Context, oldComposabilityRequest, newComposabilityRequest *crov1alpha1.ComposabilityRequest) (warnings admission.Warnings, err error) {
composabilityRequestWebhookLog.Info("validation for ComposabilityRequest upon update", "name", newComposabilityRequest.GetName())

return validateRequest(v, newComposabilityRequest, ctx, newObj)
return validateRequest(v, newComposabilityRequest, ctx)
}

// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (warnings admission.Warnings, err error) {
// ValidateDelete implements admission.Validator so a webhook will be registered for the type ComposabilityRequest.
func (v *ComposabilityRequestCustomValidator) ValidateDelete(ctx context.Context, composabilityrequest *crov1alpha1.ComposabilityRequest) (warnings admission.Warnings, err error) {
return nil, nil
}

func validateRequest(v *ComposabilityRequestCustomValidator, r *crov1alpha1.ComposabilityRequest, ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
func validateRequest(v *ComposabilityRequestCustomValidator, r *crov1alpha1.ComposabilityRequest, ctx context.Context) (admission.Warnings, error) {
composabilityRequestList := &crov1alpha1.ComposabilityRequestList{}
if err := v.List(ctx, composabilityRequestList); err != nil {
composabilityRequestWebhookLog.Error(err, "failed to list ComposabilityRequests")
Expand Down