(incubator-streampark) branch dev-2.1.2 updated: [FIX] fix ingrress to flink ui static resources 404

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.2 by this push:
     new da01bd5eb [FIX] fix ingrress to flink ui static resources 404
da01bd5eb is described below

commit da01bd5eb64fffe721e4be679f48fd6519c3b089
Author: benjobs <benj...@apache.org>
AuthorDate: Wed Nov 1 22:08:23 2023 +0800

    [FIX] fix ingrress to flink ui static resources 404
---
 .../apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala  | 4 ++--
 .../streampark/flink/kubernetes/ingress/IngressStrategyV1.scala       | 2 +-
 .../streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala
 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala
index d07e2aff8..5cd51e8f3 100644
--- 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala
+++ 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala
@@ -47,11 +47,11 @@ trait IngressStrategy {
     }
   }
 
-  def buildIngressAnnotations(clusterId: String): Map[String, String] = {
+  def buildIngressAnnotations(clusterId: String, namespace: String): 
Map[String, String] = {
     val annotations = Map(
       "nginx.ingress.kubernetes.io/rewrite-target" -> "/$2",
       "nginx.ingress.kubernetes.io/proxy-body-size" -> "1024m",
-      "nginx.ingress.kubernetes.io/configuration-snippet" -> ("rewrite ^(/" + 
clusterId + ")$ $1/ permanent;")
+      "nginx.ingress.kubernetes.io/configuration-snippet" -> s"""rewrite 
^(/$clusterId)$$ $$1/ permanent; sub_filter '<base href="./">' '<base 
href="/$namespace/$clusterId/">'; sub_filter_once off;"""
     )
     val ingressClass = 
InternalConfigHolder.get[String](K8sFlinkConfig.ingressClass)
     if (ingressClass.nonEmpty) {
diff --git 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1.scala
 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1.scala
index c5c2fdd0b..9e53471bc 100644
--- 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1.scala
+++ 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1.scala
@@ -57,7 +57,7 @@ class IngressStrategyV1 extends IngressStrategy {
         val ingress = new IngressBuilder()
           .withNewMetadata()
           .withName(clusterId)
-          .addToAnnotations(buildIngressAnnotations(clusterId).asJava)
+          .addToAnnotations(buildIngressAnnotations(clusterId, 
nameSpace).asJava)
           .addToLabels(buildIngressLabels(clusterId).asJava)
           .addToOwnerReferences(ownerReference) // Add OwnerReference
           .endMetadata()
diff --git 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala
 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala
index 8cbc276e4..bf12e7a1b 100644
--- 
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala
+++ 
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala
@@ -57,7 +57,7 @@ class IngressStrategyV1beta1 extends IngressStrategy {
         val ingress = new IngressBuilder()
           .withNewMetadata()
           .withName(clusterId)
-          .addToAnnotations(buildIngressAnnotations(clusterId).asJava)
+          .addToAnnotations(buildIngressAnnotations(clusterId, 
nameSpace).asJava)
           .addToLabels(buildIngressLabels(clusterId).asJava)
           .addToOwnerReferences(ownerReference)
           .endMetadata()