Skip to content

The Unified and Autonomous Development Platform

User can select whether or not to create cache labels on k8s

Robin Shen095d7dbea410
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index acbc5b1a98..3f47b3407e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -48,6 +48,9 @@
padding-bottom: 0;
margin-bottom: 0;
}
+.editable td.value>div>.checkbox, .editable td.value>div>.checkbox>label {
+ margin: 0;
+}
.editable>.bean-properties>table>tbody>tr>td.name {
font-weight: bold;
@@ -141,3 +144,4 @@
.form-group>.editable>.list>.head {
margin-top: 8px;
}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
index b89a7567be..4426e76f56 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
@@ -23,12 +23,5 @@ onedev.server.editable = {
$checkbox.children("label").append($label.children("span").text());
$label.remove();
});
-
- $container.find("td.value>div>.checkbox").each(function() {
- var $checkbox = $(this);
- var $td = $checkbox.parent().parent().prev("td.name");
- $checkbox.children("label").append($td.children("span").text());
- $td.empty();
- });
}
}
\ No newline at end of file
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 4d2df0fdbf..90e6bfc9f3 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
@@ -92,6 +92,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private String configFile;
private String kubeCtlPath;
+
+ private boolean createCacheLabels = true;
@Editable(order=20, description="Optionally specify node selector of the job pods")
public List<NodeSelectorEntry> getNodeSelector() {
@@ -172,6 +174,18 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
this.kubeCtlPath = kubeCtlPath;
}
+ @Editable(order=60000, group="More Settings", description="If enabled, OneDev will create labels "
+ + "on nodes to record cache count for each cache key in job definition, and then "
+ + "leverage Kubernetes node affinity feature to improve job cache hit rate. Note that "
+ + "many labels might be created on node if there are many cache keys")
+ public boolean isCreateCacheLabels() {
+ return createCacheLabels;
+ }
+
+ public void setCreateCacheLabels(boolean createCacheLabels) {
+ this.createCacheLabels = createCacheLabels;
+ }
+
@Override
public void execute(String jobToken, JobContext jobContext) {
execute(jobContext.getImage(), jobToken, jobContext.getLogger(), jobContext);
@@ -867,7 +881,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
logger.debug("Collecting init container log (pod: {})...", podFQN);
collectContainerLog(namespace, podName, "init", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
- if (jobContext != null)
+ if (jobContext != null && isCreateCacheLabels())
updateCacheLabels(nodeName, jobContext, jobLogger);
logger.debug("Waiting for main container to start (pod: {})...", podFQN);
@@ -931,7 +945,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}, jobLogger);
- if (jobContext != null)
+ if (jobContext != null && isCreateCacheLabels())
updateCacheLabels(nodeName, jobContext, jobLogger);
} finally {
deleteNamespace(namespace, jobLogger);