Skip to content

The Unified and Autonomous Development Platform

Some minor improvements

Robin Shen451e295eb63d
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
index 1d4107dc26..b6400ae1a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
@@ -1,6 +1,5 @@
<wicket:extend>
- <div class="alert alert-info mb-5"><wicket:svg href="bulb" class="icon"></wicket:svg> Agents are used by remote docker/shell executor
- to dispatch build jobs to remote machines</div>
+ <div class="alert alert-info mb-5"><wicket:svg href="bulb" class="icon"></wicket:svg> Agents can be used to run jobs on other machines without Kubernetes</div>
<div class="side-main side-main-wrap">
<div wicket:id="savedQueries" class="side"></div>
<div wicket:id="agents" class="main"></div>
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.java
index eeeb89c012..8220aa7445 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
@@ -81,6 +81,7 @@ import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.util.Testable;
@Editable(order=300, description="This executor runs build jobs as pods in a kubernetes cluster. "
+ + "No any agents are required."
+ "<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system "
+ "setting as job pods need to access it to download source and artifacts")
@Horizontal
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
index b0b70aef49..916459c40c 100644
--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
@@ -31,7 +31,7 @@ import io.onedev.server.util.CollectionUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-@Editable(order=210, description="This executor runs build jobs as docker containers on remote machines via agents")
+@Editable(order=210, description="This executor runs build jobs as docker containers on remote machines via <a href='/administration/agents' target='_blank'>agents</a>")
public class RemoteDockerExecutor extends ServerDockerExecutor implements AgentQueryAware {
private static final long serialVersionUID = 1L;