[feat] after review fix. Added spark-ui svc validation

Author: aagumin

internal/webhook/sparkapplication_validator.go

@@ -23,6 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
@@ -100,10 +101,6 @@ func (v *SparkApplicationValidator) ValidateUpdate(ctx context.Context, oldObj r
 		return nil, nil
 	}
 
-	if err := v.validateMetadata(ctx, newApp); err != nil {
-		return nil, err
-	}
-
 	if err := v.validateSpec(ctx, newApp); err != nil {
 		return nil, err
 	}
@@ -202,9 +199,14 @@ func (v *SparkApplicationValidator) validateResourceUsage(ctx context.Context, a
 
 func (v *SparkApplicationValidator) validateMetadata(ctx context.Context, app *v1beta2.SparkApplication) error {
 	meta := app.ObjectMeta
-	err := validateNameLength(ctx, meta)
-	if err != nil {
+	if err := validateNameLength(ctx, meta); err != nil {
 		return err
 	}
+
+	svcName := util.GetDefaultUIServiceName(app)
+	if errs := validation.IsDNS1035Label(svcName); len(errs) != 0 {
+		return fmt.Errorf("spark UI service name %q is not a DNS 1035 label. Try to make the application name shorter", svcName)
+	}
+
 	return nil
 }

internal/webhook/webhook.go

@@ -19,7 +19,9 @@ package webhook
 import (
 	"context"
 	"fmt"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
@@ -46,9 +48,9 @@ type Options struct {
 // and early error message.
 func validateNameLength(_ context.Context, appMeta metav1.ObjectMeta) error {
 	var allErrs field.ErrorList
-	if len(appMeta.Name) > maxAppNameLength {
+	if len(appMeta.Name) > validation.LabelValueMaxLength {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("metadata", "name"), appMeta.Name,
-			fmt.Sprintf("name must be no more than %d characters to allow for resource suffixes", maxAppNameLength)))
+			fmt.Sprintf("name length must not exceed %d characters to allow for resource suffixes", maxAppNameLength)))
 	}
 	if allErrs != nil {
 		return allErrs.ToAggregate()

test/e2e/bad_examples/long-name-validation.yaml

@@ -1,8 +1,7 @@
 apiVersion: sparkoperator.k8s.io/v1beta2
 kind: SparkApplication
 metadata:
-  name: this-is-a-very-very-very-long-application-name-that-exceeds-the-limit
-  namespace: default
+  name: this-is-a-very-very-very-long-application-name-that-words
 spec:
   type: Scala
   mode: cluster
@@ -24,4 +23,4 @@ spec:
       version: 4.0.0
     instances: 1
     cores: 1
-    memory: 512m
+    memory: 512m