[FIX] fix ingrress to flink ui static resources 404

apache · Nov 1, 2023 · da01bd5 · da01bd5
1 parent 5f139f1
commit da01bd5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...netes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategy.scala b/...netes/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/...tes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1.scala b/...tes/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/...rc/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressStrategyV1beta1.scala b/...rc/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()