This is an automated email from the ASF dual-hosted git repository.
linying pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new c7e5cacf4 [FIX] fix ingrress to flink ui static resources 404 (#3302)
c7e5cacf4 is described below
commit c7e5cacf464aa70513dbc23763d9411bf6a569a0
Author: Bibo <[email protected]>
AuthorDate: Wed Nov 1 18:12:52 2023 +0800
[FIX] fix ingrress to flink ui static resources 404 (#3302)
---
.../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 5cba3b36f..6041c9bfb 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 b8346cc1d..17ac4b775 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
@@ -55,7 +55,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 a5ca4258e..332f857dd 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
@@ -56,7 +56,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()
