[hotfix] k8s helm support using the default Kubernetes client configu…

…ration.
apache · Oct 14, 2024 · 8a50d88 · 8a50d88
1 parent 4e7fc9b
commit 8a50d88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java b/amoro-ams/src/main/java/org/apache/amoro/server/manager/KubernetesOptimizerContainer.java
@@ -31,6 +31,7 @@
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
 import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
 import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import org.apache.amoro.resource.Resource;
@@ -51,6 +52,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /** Kubernetes Optimizer Container with Standalone Optimizer */
@@ -77,8 +79,12 @@ public class KubernetesOptimizerContainer extends AbstractResourceContainer {
   public void init(String name, Map<String, String> containerProperties) {
     super.init(name, containerProperties);
     // start k8s job using k8s client
-    String kubeConfigPath = checkAndGetProperty(containerProperties, KUBE_CONFIG_PATH);
-    Config config = Config.fromKubeconfig(getKubeConfigContent(kubeConfigPath));
+    Optional<String> kubeConfigPath =
+        Optional.ofNullable(containerProperties.get(KUBE_CONFIG_PATH));
+    Config config =
+        kubeConfigPath
+            .map(path -> Config.fromKubeconfig(getKubeConfigContent(path)))
+            .orElseGet(() -> new ConfigBuilder().build());
     this.client = new KubernetesClientBuilder().withConfig(config).build();
   }
 

diff --git a/charts/amoro/values.yaml b/charts/amoro/values.yaml
@@ -261,7 +261,8 @@ optimizer:
     enabled: true
     properties:
       namespace: "default"
-      kube-config-path: "~/.kube/config"
+      # if service account rbac not have, need kube config set in optimizer deployment
+      #kube-config-path: "~/.kube/config"
       image: "apache/amoro:latest"
       pullPolicy: "IfNotPresent"
   extra: []