(incubator-streampark) branch dev-2.1.3 updated: [Improve] set ingress class improvement

[benjobs]

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

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


The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
     new a3a5c2671 [Improve] set ingress class improvement
a3a5c2671 is described below

commit a3a5c2671d36475e28acd1f5d6f77218aa66db68
Author: benjobs <benj...@gmail.com>
AuthorDate: Wed Jan 24 14:01:42 2024 +0800

    [Improve] set ingress class improvement
---
 .../streampark/flink/kubernetes/ingress/IngressStrategy.scala      | 7 +++----
 .../streampark/flink/kubernetes/ingress/IngressStrategyV1.scala    | 1 +
 .../flink/kubernetes/ingress/IngressStrategyV1beta1.scala          | 1 +
 3 files changed, 5 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 f116a6eda..a049c12a4 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
@@ -28,6 +28,8 @@ import java.io.File
 
 trait IngressStrategy {
 
+  lazy val ingressClass = 
InternalConfigHolder.get[String](K8sFlinkConfig.ingressClass)
+
   def ingressUrlAddress(
       nameSpace: String,
       clusterId: String,
@@ -49,14 +51,11 @@ trait IngressStrategy {
 
   def buildIngressAnnotations(clusterId: String, namespace: String): 
Map[String, String] = {
     var annotations = Map(
+      "kubernetes.io/ingress.class" -> ingressClass,
       "nginx.ingress.kubernetes.io/rewrite-target" -> "/$2",
       "nginx.ingress.kubernetes.io/proxy-body-size" -> "1024m",
       "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) {
-      annotations += ("kubernetes.io/ingress.class" -> ingressClass)
-    }
     annotations
   }
 
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 9e53471bc..a4e08e49b 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
@@ -62,6 +62,7 @@ class IngressStrategyV1 extends IngressStrategy {
           .addToOwnerReferences(ownerReference) // Add OwnerReference
           .endMetadata()
           .withNewSpec()
+          .withIngressClassName(ingressClass)
           .addNewRule()
           .withHost(domainName)
           .withNewHttp()
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 bf12e7a1b..f143f073a 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
@@ -62,6 +62,7 @@ class IngressStrategyV1beta1 extends IngressStrategy {
           .addToOwnerReferences(ownerReference)
           .endMetadata()
           .withNewSpec()
+          .withIngressClassName(ingressClass)
           .addNewRule()
           .withHost(domainName)
           .withNewHttp()