The Unified and Autonomous Development Platform
Fix issue #749 - Disable server/agent shell executor when server/agent is running in docker mode to avoid confusion
Robin Shenb23f3ed1e290
diff --git a/pom.xml b/pom.xmlindex b72ae729bf..034c9f2c8e 100644--- a/pom.xml+++ b/pom.xml@@ -589,7 +589,7 @@</repositories><properties><commons.version>2.1.2</commons.version>- <agent.version>1.3.6</agent.version>+ <agent.version>1.3.7</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.9</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 9287ab23ab..019089681b 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -155,10 +155,14 @@ public class OneDev extends AbstractPlugin implements Serializable {}}+ public static String getK8sService() {+ return System.getenv("k8s_service");+ }+public String guessServerUrl() {Url serverUrl = null;- String k8sService = System.getenv("k8s_service");+ String k8sService = getK8sService();if (k8sService != null) { // we are running inside KubernetesCommandline kubectl = new Commandline("kubectl");kubectl.addArgs("get", "service", k8sService, "-o",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 a5ef1a0d2b..07a384f11f 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@@ -97,7 +97,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataprivate static final long serialVersionUID = 1L;- static final int ORDER = 100;+ static final int ORDER = 40;private static final int POD_WATCH_TIMEOUT = 60;diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.javaindex 52ae7628db..1ab72415f4 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java@@ -1,19 +1,15 @@package io.onedev.server.plugin.executor.kubernetes;-import java.io.File;import java.util.Collection;-import org.apache.commons.lang.SystemUtils;import org.glassfish.jersey.server.ResourceConfig;import com.google.common.collect.Sets;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;-import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.TaskLogger;-import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.rest.jersey.JerseyConfigurator;@@ -46,36 +42,12 @@ public class KubernetesModule extends AbstractPluginModule {@Overridepublic JobExecutor discover(TaskLogger jobLogger) {- jobLogger.log("Checking if there is a Kubernetes cluster...");+ jobLogger.log("Checking if inside Kubernetes cluster...");- Commandline kubectl;- if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/kubectl").exists())- kubectl = new Commandline("/usr/local/bin/kubectl");- else- kubectl = new Commandline("kubectl");- kubectl.addArgs("cluster-info");- try {- kubectl.execute(new LineConsumer() {-- @Override- public void consume(String line) {- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- }-- }).checkReturnCode();-+ if (OneDev.getK8sService() != null)return new KubernetesExecutor();- } catch (Exception e) {- if (ExceptionUtils.find(e, InterruptedException.class) != null)- throw ExceptionUtils.unchecked(e);- else- return null;- }+ else+ return null;}@Overridediff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex db8d642425..9633b060da 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -144,6 +144,11 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa@Overridepublic void execute(String jobToken, JobContext jobContext) {+ if (OneDev.getK8sService() != null) {+ throw new ExplicitException(""+ + "OneDev running inside kubernetes cluster does not support server docker executor. "+ + "Please use kubernetes executor instead");+ }File hostBuildHome = FileUtils.createTempDir("onedev-build");try {TaskLogger jobLogger = jobContext.getLogger();diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.javaindex 3b1ece3345..35b4828d9f 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java@@ -13,6 +13,7 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -27,63 +28,66 @@ public class ServerDockerModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(ImplementationProvider.class, new ImplementationProvider() {- @Override- public Class<?> getAbstractClass() {- return JobExecutor.class;- }+ if (OneDev.getK8sService() == null) {+ contribute(ImplementationProvider.class, new ImplementationProvider() {- @Override- public Collection<Class<?>> getImplementations() {- return Sets.newHashSet(ServerDockerExecutor.class);- }-- });-- contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {+ @Override+ public Class<?> getAbstractClass() {+ return JobExecutor.class;+ }- @Override- public JobExecutor discover(TaskLogger jobLogger) {- jobLogger.log("Checking if there is docker facility...");-- Commandline docker;- if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/docker").exists())- docker = new Commandline("/usr/local/bin/docker");- else- docker = new Commandline("docker");+ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(ServerDockerExecutor.class);+ }- docker.addArgs("version");- try {- docker.execute(new LineConsumer() {-- @Override- public void consume(String line) {- }-- }, new LineConsumer() {+ });- @Override- public void consume(String line) {- }-- }).checkReturnCode();+ contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {++ @Override+ public JobExecutor discover(TaskLogger jobLogger) {+ jobLogger.log("Checking if there is docker facility...");- return new ServerDockerExecutor();- } catch (Exception e) {- if (ExceptionUtils.find(e, InterruptedException.class) != null)- throw ExceptionUtils.unchecked(e);+ Commandline docker;+ if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/docker").exists())+ docker = new Commandline("/usr/local/bin/docker");else- return null;+ docker = new Commandline("docker");++ docker.addArgs("version");+ try {+ docker.execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ }++ }).checkReturnCode();++ return new ServerDockerExecutor();+ } catch (Exception e) {+ if (ExceptionUtils.find(e, InterruptedException.class) != null)+ throw ExceptionUtils.unchecked(e);+ else+ return null;+ }}- }- @Override- public int getOrder() {- return ServerDockerExecutor.ORDER;- }-- });+ @Override+ public int getOrder() {+ return ServerDockerExecutor.ORDER;+ }++ });+ }}}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 1e4ae361d6..48b9f49456 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -73,6 +73,15 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat@Overridepublic void execute(String jobToken, JobContext jobContext) {+ if (OneDev.getK8sService() != null) {+ throw new ExplicitException(""+ + "OneDev running inside kubernetes cluster does not support server shell executor. "+ + "Please use kubernetes executor instead");+ } else if (Bootstrap.isInDocker()) {+ throw new ExplicitException("Server shell executor is only supported when OneDev is installed "+ + "directly on bare metal/virtual machine");+ }+TaskLogger jobLogger = jobContext.getLogger();OneDev.getInstance(ResourceManager.class).run(new Runnable() {diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.javaindex 2453d6b94b..833a1ea452 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java@@ -4,6 +4,7 @@ import java.util.Collection;import com.google.common.collect.Sets;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.TaskLogger;@@ -21,35 +22,36 @@ public class ServerShellModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(ImplementationProvider.class, new ImplementationProvider() {-- @Override- public Class<?> getAbstractClass() {- return JobExecutor.class;- }-- @Override- public Collection<Class<?>> getImplementations() {- return Sets.newHashSet(ServerShellExecutor.class);- }+ if (!Bootstrap.isInDocker()) {+ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Class<?> getAbstractClass() {+ return JobExecutor.class;+ }++ @Override+ public Collection<Class<?>> getImplementations() {+ return Sets.newHashSet(ServerShellExecutor.class);+ }++ });- });-- contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {-- @Override- public JobExecutor discover(TaskLogger jobLogger) {- jobLogger.log("Fallback to shell facility");- return new ServerShellExecutor();- }-- @Override- public int getOrder() {- return ServerShellExecutor.ORDER;- }-- });-+ contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {++ @Override+ public JobExecutor discover(TaskLogger jobLogger) {+ jobLogger.log("Fallback to shell facility");+ return new ServerShellExecutor();+ }++ @Override+ public int getOrder() {+ return ServerShellExecutor.ORDER;+ }++ });+ }}}