Skip to content

Commit e10d94d

Browse files
Jam804tclxyuhang2-zhangactions-user
authored
[Bug] [dinky-gateway] Fix import errors in utility classes and Fix configuration issues related to frontend display (#4299)
Co-authored-by: yuhang2.zhang <[email protected]> Co-authored-by: GH Action - Upstream Sync <[email protected]>
1 parent 54b3564 commit e10d94d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ protected void initConfig() {
120120
final String oldContainerImageKey = "kubernetes.container.image";
121121
if (k8sConfiguration.containsKey(oldContainerImageKey)) {
122122
String containerImageValue = k8sConfiguration.get(oldContainerImageKey);
123-
k8sConfiguration.remove(oldContainerImageKey);
124123
k8sConfiguration.put(KubernetesConfigOptions.CONTAINER_IMAGE.key(), containerImageValue);
125124
}
126125
// -------------------Note: the sequence can not be changed, priority problem----------------

dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/watcher/DeploymentStatusWatcher.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919

2020
package org.dinky.gateway.kubernetes.watcher;
2121

22-
import org.apache.hadoop.util.StringUtils;
23-
2422
import java.util.List;
2523

2624
import cn.hutool.core.collection.CollectionUtil;
2725
import cn.hutool.core.util.ObjectUtil;
26+
import cn.hutool.core.util.StrUtil;
2827
import io.fabric8.kubernetes.api.model.apps.Deployment;
2928
import io.fabric8.kubernetes.api.model.apps.DeploymentCondition;
3029
import io.fabric8.kubernetes.client.Watcher;
@@ -42,7 +41,7 @@ public void eventReceived(Action action, Deployment deployment) {
4241
&& CollectionUtil.isNotEmpty(deployment.getStatus().getConditions())) {
4342
List<DeploymentCondition> conditions = deployment.getStatus().getConditions();
4443
conditions.forEach(condition -> {
45-
if (StringUtils.equalsIgnoreCase(condition.getStatus(), "true")) {
44+
if (StrUtil.equalsIgnoreCase(condition.getStatus(), "true")) {
4645
log.info(
4746
"deployment name: {}, deployment status: {}, message: {}",
4847
deploymentName,

0 commit comments

Comments
 (0)