Skip to content

The Unified and Autonomous Development Platform

Remove createCacheLabels option of KubernetesExecutor

Robin Shenfddbdd5eb59c
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index c6ee7dad85..ae17a70b9e 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3225,7 +3225,7 @@ public class DataMigrator {
private void migrate69(File dataDir, Stack<Integer> versions) {
}
- // Migrate to 6.0
+ // Migrate to 5.4.0
private void migrate70(File dataDir, Stack<Integer> versions) {
Long scheduleId = 1L;
VersionedXmlDoc issueSchedulesDoc = new VersionedXmlDoc();
@@ -3269,7 +3269,20 @@ public class DataMigrator {
}
}
dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("JOB_EXECUTORS")) {
+ Element valueElement = element.element("value");
+ for (Element executorElement: valueElement.elements()) {
+ if (executorElement.getName().contains("KubernetesExecutor"))
+ executorElement.element("createCacheLabels").detach();
+ }
+ }
+ }
+ dom.writeToFile(file, false);
}
+
}
issueSchedulesDoc.writeToFile(new File(dataDir, "IssueSchedules.xml"), false);
}
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 0bc0c560d7..f9a9221848 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
@@ -109,8 +109,6 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private String kubeCtlPath;
- private boolean createCacheLabels = true;
-
@Editable(order=20, description="Optionally specify node selector of the job pods")
public List<NodeSelectorEntry> getNodeSelector() {
return nodeSelector;
@@ -177,18 +175,6 @@ 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(jobToken, jobContext.getLogger(), jobContext);