The Unified and Autonomous Development Platform
Fix issue #837 - Kubernetes executor no longer works
Robin Shenaf0cd4bc9784
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex 51af85d2e2..ad26c9dd16 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -21,7 +21,9 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@Editable(order=150, name="Run Docker Container", description="Run specified docker container. To access files in "- + "job workspace, either use environment variable <tt>JOB_WORKSPACE</tt>, or specify volume mounts")+ + "job workspace, either use environment variable <tt>JOB_WORKSPACE</tt>, or specify volume mounts. "+ + "<b class='text-warning'>NOTE:</b> If this step runs with a Kubernetes executor, the option "+ + "<code>mount container sock</code> of that executor must be enabled")public class RunContainerStep extends Step {private static final long serialVersionUID = 1L;diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 90fef36295..263dcc0de1 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -319,7 +319,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataAtomicBoolean namespaceExists = new AtomicBoolean(false);Commandline kubectl = newKubeCtl();kubectl.addArgs("get", "namespaces", "--field-selector", "metadata.name=" + namespace,- "-o", "name", "--chunk-size=", "0");+ "-o", "name", "--chunk-size=0");kubectl.execute(new LineConsumer() {@Override