Add web UI configurations when enabling UI service and ingress (#2599)

Signed-off-by: Yi Chen <[email protected]>

Author: ChenYi015

internal/controller/sparkapplication/controller.go

@@ -318,14 +318,6 @@ func (r *Reconciler) reconcileSubmittedSparkApplication(ctx context.Context, req
 					if err != nil {
 						return fmt.Errorf("failed to get ingress url: %v", err)
 					}
-					// need to ensure the spark.ui variables are configured correctly if a subPath is used.
-					if ingressURL.Path != "" {
-						if app.Spec.SparkConf == nil {
-							app.Spec.SparkConf = make(map[string]string)
-						}
-						app.Spec.SparkConf[common.SparkUIProxyBase] = ingressURL.Path
-						app.Spec.SparkConf[common.SparkUIProxyRedirectURI] = "/"
-					}
 					ingress, err := r.createWebUIIngress(ctx, app, *service, ingressURL, r.options.IngressClassName, r.options.IngressTLS, r.options.IngressAnnotations)
 					if err != nil {
 						return fmt.Errorf("failed to create web UI ingress: %v", err)
@@ -739,6 +731,10 @@ func (r *Reconciler) submitSparkApplication(ctx context.Context, app *v1beta2.Sp
 		r.recordSparkApplicationEvent(app)
 	}()
 
+	if err := r.configWebUI(ctx, app); err != nil {
+		return fmt.Errorf("failed to configure web UI: %v", err)
+	}
+
 	if util.PrometheusMonitoringEnabled(app) {
 		logger.Info("Configure Prometheus monitoring for SparkApplication")
 		if err := configPrometheusMonitoring(ctx, app, r.client); err != nil {

internal/controller/sparkapplication/web_ui.go

@@ -29,6 +29,27 @@ import (
 	"github.com/kubeflow/spark-operator/v2/pkg/util"
 )
 
+func (r *Reconciler) configWebUI(_ context.Context, app *v1beta2.SparkApplication) error {
+	if !r.options.EnableUIService || r.options.IngressURLFormat == "" {
+		return nil
+	}
+
+	ingressURL, err := getDriverIngressURL(r.options.IngressURLFormat, app)
+	if err != nil {
+		return fmt.Errorf("failed to get ingress url: %v", err)
+	}
+	if ingressURL.Path == "" {
+		return nil
+	}
+
+	if app.Spec.SparkConf == nil {
+		app.Spec.SparkConf = make(map[string]string)
+	}
+	util.SetIfNotExists(app.Spec.SparkConf, common.SparkUIProxyBase, ingressURL.Path)
+	util.SetIfNotExists(app.Spec.SparkConf, common.SparkUIProxyRedirectURI, "/")
+	return nil
+}
+
 func (r *Reconciler) createWebUIService(ctx context.Context, app *v1beta2.SparkApplication) (*SparkService, error) {
 	portName := getWebUIServicePortName(app)
 	port, err := getWebUIServicePort(app)

pkg/util/util.go

@@ -150,3 +150,13 @@ func ConvertJavaMemoryStringToK8sMemoryString(memory string) string {
 	// return original memory value if no conversion is needed
 	return memory
 }
+
+func SetIfNotExists[K comparable, V any](m map[K]V, key K, value V) {
+	if m == nil {
+		return
+	}
+
+	if _, ok := m[key]; !ok {
+		m[key] = value
+	}
+}