Skip to content

fix: register admission webhook handlers #504

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
catpineapple merged 1 commit into from
Jul 7, 2026
+46 −21
Merged

fix: register admission webhook handlers #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions api/disaggregated/v1/disaggregatedcluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import (
func (ddc *DorisDisaggregatedCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
return ctrl.NewWebhookManagedBy(mgr).
For(ddc).
WithDefaulter(ddc).
WithValidator(ddc).
Complete()
}

Expand All @@ -53,9 +55,13 @@ var _ webhook.CustomValidator = &DorisDisaggregatedCluster{}

// ValidateCreate implements webhook.Validator so a unnamedwatches will be registered for the type
func (ddc *DorisDisaggregatedCluster) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
klog.Info("validate create", "name", ddc.Name)
cluster, ok := obj.(*DorisDisaggregatedCluster)
if !ok {
return nil, fmt.Errorf("expected a DorisDisaggregatedCluster but got %T", obj)
}
klog.Info("validate create", "name", cluster.Name)

if errs := ddc.validate(); len(errs) != 0 {
if errs := cluster.validate(); len(errs) != 0 {
return nil, kerrors.NewAggregate(errs)
}

Expand All @@ -64,9 +70,13 @@ func (ddc *DorisDisaggregatedCluster) ValidateCreate(ctx context.Context, obj ru

// ValidateUpdate implements webhook.Validator so a unnamedwatches will be registered for the type
func (ddc *DorisDisaggregatedCluster) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
klog.Info("validate update", "name", ddc.Name)
cluster, ok := newObj.(*DorisDisaggregatedCluster)
if !ok {
return nil, fmt.Errorf("expected a DorisDisaggregatedCluster but got %T", newObj)
}
klog.Info("validate update", "name", cluster.Name)

if errs := ddc.validate(); len(errs) != 0 {
if errs := cluster.validate(); len(errs) != 0 {
return nil, kerrors.NewAggregate(errs)
}

Expand Down
19 changes: 11 additions & 8 deletions api/disaggregated/v1/disaggregatedcluster_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,41 @@ import (
)

func TestDorisDisaggregatedClusterRejectsAdminManagementUser(t *testing.T) {
validator := &DorisDisaggregatedCluster{}
cluster := &DorisDisaggregatedCluster{
Spec: DorisDisaggregatedClusterSpec{
AdminUser: &AdminUser{Name: "admin"},
},
}

if _, err := cluster.ValidateCreate(context.Background(), cluster); err == nil {
if _, err := validator.ValidateCreate(context.Background(), cluster); err == nil {
t.Fatal("expected admin management user to be rejected on create")
}

if _, err := cluster.ValidateUpdate(context.Background(), cluster, cluster); err == nil {
if _, err := validator.ValidateUpdate(context.Background(), cluster, cluster); err == nil {
t.Fatal("expected admin management user to be rejected on update")
}
}

func TestDorisDisaggregatedClusterAllowsNonAdminManagementUser(t *testing.T) {
validator := &DorisDisaggregatedCluster{}
cluster := &DorisDisaggregatedCluster{
Spec: DorisDisaggregatedClusterSpec{
AdminUser: &AdminUser{Name: "doris_operator"},
},
}

if _, err := cluster.ValidateCreate(context.Background(), cluster); err != nil {
if _, err := validator.ValidateCreate(context.Background(), cluster); err != nil {
t.Fatalf("expected non-admin management user to be allowed on create: %v", err)
}

if _, err := cluster.ValidateUpdate(context.Background(), cluster, cluster); err != nil {
if _, err := validator.ValidateUpdate(context.Background(), cluster, cluster); err != nil {
t.Fatalf("expected non-admin management user to be allowed on update: %v", err)
}
}

func TestDorisDisaggregatedClusterValidateFEReplicas(t *testing.T) {
validator := &DorisDisaggregatedCluster{}
replicas := int32(1)
electionNumber := int32(2)
ddc := &DorisDisaggregatedCluster{
Expand All @@ -68,18 +71,18 @@ func TestDorisDisaggregatedClusterValidateFEReplicas(t *testing.T) {
},
}

if _, err := ddc.ValidateCreate(context.Background(), ddc); err == nil {
if _, err := validator.ValidateCreate(context.Background(), ddc); err == nil {
t.Fatal("expected create validation to reject replicas smaller than electionNumber")
}
if _, err := ddc.ValidateUpdate(context.Background(), ddc, ddc); err == nil {
if _, err := validator.ValidateUpdate(context.Background(), ddc, ddc); err == nil {
t.Fatal("expected update validation to reject replicas smaller than electionNumber")
}

replicas = 2
if _, err := ddc.ValidateCreate(context.Background(), ddc); err != nil {
if _, err := validator.ValidateCreate(context.Background(), ddc); err != nil {
t.Fatalf("expected valid create to pass, got %v", err)
}
if _, err := ddc.ValidateUpdate(context.Background(), ddc, ddc); err != nil {
if _, err := validator.ValidateUpdate(context.Background(), ddc, ddc); err != nil {
t.Fatalf("expected valid update to pass, got %v", err)
}
}
20 changes: 15 additions & 5 deletions api/doris/v1/doriscluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ import (
func (r *DorisCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
return ctrl.NewWebhookManagedBy(mgr).
For(r).
WithDefaulter(r).
WithValidator(r).
Complete()
}

Expand All @@ -70,9 +72,13 @@ var _ webhook.CustomValidator = &DorisCluster{}

// ValidateCreate implements webhook.Validator so a unnamedwatches will be registered for the type
func (r *DorisCluster) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
klog.Info("validate create", "name", r.Name)
cluster, ok := obj.(*DorisCluster)
if !ok {
return nil, fmt.Errorf("expected a DorisCluster but got %T", obj)
}
klog.Info("validate create", "name", cluster.Name)

if errs := r.validateManagementUser(); len(errs) != 0 {
if errs := cluster.validateManagementUser(); len(errs) != 0 {
return nil, kerrors.NewAggregate(errs)
}

Expand All @@ -81,11 +87,15 @@ func (r *DorisCluster) ValidateCreate(ctx context.Context, obj runtime.Object) (

// ValidateUpdate implements webhook.Validator so a unnamedwatches will be registered for the type
func (r *DorisCluster) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
klog.Info("validate update", "name", r.Name)
cluster, ok := newObj.(*DorisCluster)
if !ok {
return nil, fmt.Errorf("expected a DorisCluster but got %T", newObj)
}
klog.Info("validate update", "name", cluster.Name)
var errors []error
errors = append(errors, r.validateManagementUser()...)
errors = append(errors, cluster.validateManagementUser()...)
// fe FeSpec.Replicas must greater than or equal to FeSpec.ElectionNumber
if *r.Spec.FeSpec.Replicas < r.GetElectionNumber() {
if cluster.Spec.FeSpec.Replicas != nil && *cluster.Spec.FeSpec.Replicas < cluster.GetElectionNumber() {
errors = append(errors, fmt.Errorf("'FeSpec.Replicas' error: the number of FeSpec.Replicas should greater than or equal to FeSpec.ElectionNumber"))
}

Expand Down
10 changes: 6 additions & 4 deletions api/doris/v1/doriscluster_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,39 @@ import (
)

func TestDorisClusterRejectsAdminManagementUser(t *testing.T) {
validator := &DorisCluster{}
cluster := &DorisCluster{
Spec: DorisClusterSpec{
AdminUser: &AdminUser{Name: "admin"},
},
}

if _, err := cluster.ValidateCreate(context.Background(), cluster); err == nil {
if _, err := validator.ValidateCreate(context.Background(), cluster); err == nil {
t.Fatal("expected admin management user to be rejected on create")
}

replicas := int32(3)
cluster.Spec.FeSpec = &FeSpec{BaseSpec: BaseSpec{Replicas: &replicas}}
if _, err := cluster.ValidateUpdate(context.Background(), cluster, cluster); err == nil {
if _, err := validator.ValidateUpdate(context.Background(), cluster, cluster); err == nil {
t.Fatal("expected admin management user to be rejected on update")
}
}

func TestDorisClusterAllowsNonAdminManagementUser(t *testing.T) {
validator := &DorisCluster{}
cluster := &DorisCluster{
Spec: DorisClusterSpec{
AdminUser: &AdminUser{Name: "doris_operator"},
},
}

if _, err := cluster.ValidateCreate(context.Background(), cluster); err != nil {
if _, err := validator.ValidateCreate(context.Background(), cluster); err != nil {
t.Fatalf("expected non-admin management user to be allowed on create: %v", err)
}

replicas := int32(3)
cluster.Spec.FeSpec = &FeSpec{BaseSpec: BaseSpec{Replicas: &replicas}}
if _, err := cluster.ValidateUpdate(context.Background(), cluster, cluster); err != nil {
if _, err := validator.ValidateUpdate(context.Background(), cluster, cluster); err != nil {
t.Fatalf("expected non-admin management user to be allowed on update: %v", err)
}
}
Loading