Skip to content

Commit c667c5f

Browse files
authored
[bug]fix k8s form ingresss bug (#3956)
Co-authored-by: gaoyan1998 <gaoyan1998@users.noreply.github.com>
1 parent bb55f4a commit c667c5f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

dinky-gateway/src/main/java/org/dinky/gateway/config/K8sConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ public class K8sConfig {
7575
dataType = "Map<String, String>",
7676
example = "{\"key1\": \"value1\", \"key2\": \"value2\"}",
7777
notes = "Ingress configuration properties")
78-
private Map<String, String> ingressConfig = Maps.newHashMap();
78+
private Map<String, Object> ingressConfig = Maps.newHashMap();
7979
}

dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,14 @@ private String getIngressUrl(Ingress ingress, String namespace, String clusterId
363363
* @return ingress domain
364364
*/
365365
private String checkUseIngress() {
366-
Map<String, String> ingressConfig = k8sConfig.getIngressConfig();
366+
Map<String, Object> ingressConfig = k8sConfig.getIngressConfig();
367367
if (MapUtils.isNotEmpty(ingressConfig)) {
368-
boolean ingressEnable =
369-
Boolean.parseBoolean(ingressConfig.getOrDefault(DINKY_K8S_INGRESS_ENABLED_KEY, "false"));
370-
String ingressDomain = ingressConfig.getOrDefault(DINKY_K8S_INGRESS_DOMAIN_KEY, StringUtils.EMPTY);
368+
boolean ingressEnable = Boolean.parseBoolean(ingressConfig
369+
.getOrDefault(DINKY_K8S_INGRESS_ENABLED_KEY, "false")
370+
.toString());
371+
String ingressDomain = ingressConfig
372+
.getOrDefault(DINKY_K8S_INGRESS_DOMAIN_KEY, StringUtils.EMPTY)
373+
.toString();
371374
if (ingressEnable && StringUtils.isNotEmpty(ingressDomain)) {
372375
return ingressDomain;
373376
}

0 commit comments

Comments
 (0)