The Unified and Autonomous Development Platform
feat: Kubernetes privileged namespaces (OD-2764)
Robin Shen1487af455470
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.javaindex 9b53c4c371..910676ae4d 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java@@ -9,6 +9,8 @@ import static io.onedev.server.model.support.administration.SystemSetting.PROP_Gimport static io.onedev.server.model.support.administration.SystemSetting.PROP_SESSION_TIMEOUT;import static io.onedev.server.model.support.administration.SystemSetting.PROP_SSH_ROOT_URL;import static io.onedev.server.model.support.administration.SystemSetting.PROP_USE_AVATAR_SERVICE;+import static io.onedev.server.model.support.administration.SystemSetting.PROP_DEFAULT_FORK_ROOT;+import static io.onedev.server.persistence.PersistenceUtils.tableExists;import static org.unbescape.html.HtmlEscape.escapeHtml5;@@ -723,7 +725,7 @@ public class DefaultDataService implements DataService, Serializable {}if (systemSetting != null) {- Collection<String> excludedProps = Sets.newHashSet(PROP_SSH_ROOT_URL, PROP_DISABLE_AUTO_UPDATE_CHECK, PROP_USE_AVATAR_SERVICE, PROP_SESSION_TIMEOUT);+ Collection<String> excludedProps = Sets.newHashSet(PROP_SSH_ROOT_URL, PROP_DISABLE_AUTO_UPDATE_CHECK, PROP_USE_AVATAR_SERVICE, PROP_SESSION_TIMEOUT, PROP_DEFAULT_FORK_ROOT);if (Bootstrap.isInDocker()) {excludedProps.add(PROP_GIT_LOCATION);excludedProps.add(PROP_CURL_LOCATION);diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex bddc829e41..b8a94dcc38 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -48,6 +48,8 @@ public class SystemSetting implements Serializable, Validatable {public static final String PROP_USE_AVATAR_SERVICE = "useAvatarService";public static final String PROP_DISABLE_AUTO_UPDATE_CHECK = "disableAutoUpdateCheck";++ public static final String PROP_DEFAULT_FORK_ROOT = "defaultForkRoot";private String serverUrl;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 c769c3b039..8352b51aa9 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@@ -546,23 +546,16 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,if (namespaceExists.get())deleteNamespace(namespace, jobLogger);- kubectl = newKubeCtl();- kubectl.addArgs("create", "namespace", namespace);- kubectl.execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.debug(line);- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logKubernetesError(jobLogger, line);- }-- }).checkReturnCode();+ Map<Object, Object> namespaceDef = newLinkedHashMap(+ "apiVersion", "v1",+ "kind", "Namespace",+ "metadata", newLinkedHashMap(+ "name", namespace,+ "labels", newLinkedHashMap(+ "pod-security.kubernetes.io/audit", "privileged",+ "pod-security.kubernetes.io/enforce", "privileged",+ "pod-security.kubernetes.io/warn", "privileged")));+ createResource(namespaceDef, Sets.newHashSet(), jobLogger);}private String getServerUrl() {