[bug]fix k8s form ingresss bug (#3956)

Co-authored-by: gaoyan1998 <[email protected]>
DataLinkDC · Nov 26, 2024 · c667c5f · c667c5f
1 parent bb55f4a
commit c667c5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/config/K8sConfig.java b/dinky-gateway/src/main/java/org/dinky/gateway/config/K8sConfig.java
@@ -75,5 +75,5 @@ public class K8sConfig {
             dataType = "Map<String, String>",
             example = "{\"key1\": \"value1\", \"key2\": \"value2\"}",
             notes = "Ingress configuration properties")
-    private Map<String, String> ingressConfig = Maps.newHashMap();
+    private Map<String, Object> ingressConfig = Maps.newHashMap();
 }
diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java
@@ -363,11 +363,14 @@ private String getIngressUrl(Ingress ingress, String namespace, String clusterId
      * @return ingress domain
      */
     private String checkUseIngress() {
-        Map<String, String> ingressConfig = k8sConfig.getIngressConfig();
+        Map<String, Object> ingressConfig = k8sConfig.getIngressConfig();
         if (MapUtils.isNotEmpty(ingressConfig)) {
-            boolean ingressEnable =
-                    Boolean.parseBoolean(ingressConfig.getOrDefault(DINKY_K8S_INGRESS_ENABLED_KEY, "false"));
-            String ingressDomain = ingressConfig.getOrDefault(DINKY_K8S_INGRESS_DOMAIN_KEY, StringUtils.EMPTY);
+            boolean ingressEnable = Boolean.parseBoolean(ingressConfig
+                    .getOrDefault(DINKY_K8S_INGRESS_ENABLED_KEY, "false")
+                    .toString());
+            String ingressDomain = ingressConfig
+                    .getOrDefault(DINKY_K8S_INGRESS_DOMAIN_KEY, StringUtils.EMPTY)
+                    .toString();
             if (ingressEnable && StringUtils.isNotEmpty(ingressDomain)) {
                 return ingressDomain;
             }