feat(controller): validating api server cert sans

prometherion · prometherion · commit 682db965ec06 · 2025-02-20T14:52:04.000+01:00
Signed-off-by: Dario Tranchitella &lt;dario@tranchitella.eu&gt;
diff --git a/internal/resources/api_server_certificate.go b/internal/resources/api_server_certificate.go
@@ -22,6 +22,7 @@ import (
 	"github.com/clastix/kamaji/internal/crypto"
 	"github.com/clastix/kamaji/internal/kubeadm"
 	"github.com/clastix/kamaji/internal/utilities"
+	"github.com/clastix/kamaji/internal/webhook/handlers"
 )
 
 type APIServerCertificate struct {
@@ -66,6 +67,10 @@ func (r *APIServerCertificate) GetTmpDirectory() string {
 }
 
 func (r *APIServerCertificate) CreateOrUpdate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) (res controllerutil.OperationResult, err error) {
+	if err = (handlers.TenantControlPlaneCertSANs{}).ValidateCertSANs(tenantControlPlane); err != nil {
+		return controllerutil.OperationResultNone, err
+	}
+
 	return utilities.CreateOrUpdateWithConflict(ctx, r.Client, r.resource, r.mutate(ctx, tenantControlPlane))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"github.com/clastix/kamaji/internal/crypto"`
`23`	`23`	`"github.com/clastix/kamaji/internal/kubeadm"`
`24`	`24`	`"github.com/clastix/kamaji/internal/utilities"`
	`25`	`+ "github.com/clastix/kamaji/internal/webhook/handlers"`
`25`	`26`	`)`
`26`	`27`
`27`	`28`	`type APIServerCertificate struct {`
`@@ -66,6 +67,10 @@ func (r *APIServerCertificate) GetTmpDirectory() string {`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`func (r APIServerCertificate) CreateOrUpdate(ctx context.Context, tenantControlPlane kamajiv1alpha1.TenantControlPlane) (res controllerutil.OperationResult, err error) {`
	`70`	`+ if err = (handlers.TenantControlPlaneCertSANs{}).ValidateCertSANs(tenantControlPlane); err != nil {`
	`71`	`+ return controllerutil.OperationResultNone, err`
	`72`	`+ }`
	`73`	`+`
`69`	`74`	`return utilities.CreateOrUpdateWithConflict(ctx, r.Client, r.resource, r.mutate(ctx, tenantControlPlane))`
`70`	`75`	`}`
`71`	`76`