The Unified and Autonomous Development Platform
Add support for ssh in Kubernetes executor
Robin Shen25f69b26b20f
diff --git a/docker/Dockerfile b/docker/Dockerfilenew file mode 100644index 0000000000..ffa8d7ee7d--- /dev/null+++ b/docker/Dockerfile@@ -0,0 +1,8 @@+# Build the docker image for onedev server+FROM ubuntu:18.04+COPY app /app+COPY entrypoint.sh idle.sh /root/bin/+COPY kubectl /usr/local/bin/+RUN apt-get update && apt-get install -y docker.io iproute2 curl git openjdk-8-jre-headless+EXPOSE 6610+CMD ["/root/bin/entrypoint.sh"]diff --git a/docker/build.sh b/docker/build.shnew file mode 100755index 0000000000..d20b9df92f--- /dev/null+++ b/docker/build.sh@@ -0,0 +1,16 @@+#!/bin/bash++cd ../..++echo "Detecting project version (may require some time while downloading maven dependencies)..."+buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)++mvn clean package++cp -r server-product/docker docker+cp server-product/target/onedev-${buildVersion}.zip .+unzip onedev-${buildVersion}.zip -d docker+mv docker/onedev-${buildVersion} docker/app+cp server-product/target/sandbox/site/lib/mysql* server-product/target/sandbox/site/lib/postgresql* docker/app/site/lib++docker build -t 1dev/server:${buildVersion} dockerdiff --git a/docker/entrypoint.sh b/docker/entrypoint.shnew file mode 100755index 0000000000..da34359ba2--- /dev/null+++ b/docker/entrypoint.sh@@ -0,0 +1,23 @@+#!/bin/bash++_sigterm() {+ kill -TERM "$child"+ wait "$child"+ exit 1+}+_sigint() {+ wait "$child"+ exit 1+}++trap _sigterm SIGTERM+trap _sigint SIGINT++/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf wrapper.pidfile=/app/status/onedev_upgrade.pid -- upgrade /opt/onedev &+child=$!+wait "$child"++touch /opt/onedev/IN_DOCKER+/opt/onedev/boot/wrapper-linux-x86-64 /opt/onedev/conf/wrapper.conf &+child=$!+wait "$child"diff --git a/docker/idle.sh b/docker/idle.shnew file mode 100755index 0000000000..7710d334f1--- /dev/null+++ b/docker/idle.sh@@ -0,0 +1,15 @@+#!/bin/bash++_sighandler() {+ kill -TERM "$child"+ wait "$child"+ exit 0+}++trap _sighandler SIGINT SIGTERM++while [ true ]; do+ sleep 60 &+ child=$!+ wait "$child"+donediff --git a/docker/kubectl b/docker/kubectlnew file mode 100755index 0000000000..fbdba4a181Binary files /dev/null and b/docker/kubectl differdiff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 2b8e4da9a4..66e484e6c0 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -240,8 +240,8 @@ import io.onedev.server.util.jackson.ObjectMapperConfigurator;import io.onedev.server.util.jackson.ObjectMapperProvider;import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;-import io.onedev.server.util.jetty.DefaultJettyRunner;-import io.onedev.server.util.jetty.JettyRunner;+import io.onedev.server.util.jetty.DefaultJettyLauncher;+import io.onedev.server.util.jetty.JettyLauncher;import io.onedev.server.util.markdown.DefaultMarkdownManager;import io.onedev.server.util.markdown.EntityReferenceManager;import io.onedev.server.util.markdown.MarkdownManager;@@ -310,8 +310,8 @@ public class CoreModule extends AbstractPluginModule {protected void configure() {super.configure();- bind(JettyRunner.class).to(DefaultJettyRunner.class);- bind(ServletContextHandler.class).toProvider(DefaultJettyRunner.class);+ bind(JettyLauncher.class).to(DefaultJettyLauncher.class);+ bind(ServletContextHandler.class).toProvider(DefaultJettyLauncher.class);bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class).in(Singleton.class);diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 7bc0e15a46..a605677dca 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -23,6 +23,8 @@ import org.apache.wicket.request.Url.StringMode;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.inject.Provider;+import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AbstractPlugin;import io.onedev.commons.launcher.loader.AppLoader;@@ -45,7 +47,7 @@ import io.onedev.server.util.ServerConfig;import io.onedev.server.util.Version;import io.onedev.server.util.init.InitStage;import io.onedev.server.util.init.ManualConfig;-import io.onedev.server.util.jetty.JettyRunner;+import io.onedev.server.util.jetty.JettyLauncher;import io.onedev.server.util.schedule.TaskScheduler;public class OneDev extends AbstractPlugin implements Serializable {@@ -54,7 +56,7 @@ public class OneDev extends AbstractPlugin implements Serializable {private static final Logger logger = LoggerFactory.getLogger(OneDev.class);- private final JettyRunner jettyRunner;+ private final Provider<JettyLauncher> jettyLauncherProvider;private final PersistManager persistManager;@@ -64,7 +66,7 @@ public class OneDev extends AbstractPlugin implements Serializable {private final DataManager dataManager;- private final ServerConfig serverConfig;+ private final Provider<ServerConfig> serverConfigProvider;private final ListenerRegistry listenerRegistry;@@ -74,18 +76,20 @@ public class OneDev extends AbstractPlugin implements Serializable {private volatile InitStage initStage;+ // Some are injected via provider as instantiation might encounter problem during upgrade@Inject- public OneDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler,- SessionManager sessionManager, ServerConfig serverConfig, DataManager dataManager,+ public OneDev(Provider<JettyLauncher> jettyLauncherProvider, PersistManager persistManager,+ TaskScheduler taskScheduler, SessionManager sessionManager,+ Provider<ServerConfig> serverConfigProvider, DataManager dataManager,SettingManager settingManager, ExecutorService executorService,ListenerRegistry listenerRegistry) {- this.jettyRunner = jettyRunner;+ this.jettyLauncherProvider = jettyLauncherProvider;this.persistManager = persistManager;this.taskScheduler = taskScheduler;this.sessionManager = sessionManager;this.settingManager = settingManager;this.dataManager = dataManager;- this.serverConfig = serverConfig;+ this.serverConfigProvider = serverConfigProvider;this.executorService = executorService;this.listenerRegistry = listenerRegistry;@@ -97,17 +101,18 @@ public class OneDev extends AbstractPlugin implements Serializable {SecurityUtils.bindAsSystem();System.setProperty("hsqldb.reconfig_logging", "false");- jettyRunner.start();- if (Bootstrap.command == null)+ if (Bootstrap.command == null) {+ jettyLauncherProvider.get().start();taskScheduler.start();+ }persistManager.start();List<ManualConfig> manualConfigs = dataManager.init();if (!manualConfigs.isEmpty()) {logger.warn("Please set up the server at "- + guessServerUrl().toString(StringMode.FULL));+ + guessServerUrl(false).toString(StringMode.FULL));initStage = new InitStage("Server Setup", manualConfigs);initStage.waitForFinish();@@ -132,7 +137,7 @@ public class OneDev extends AbstractPlugin implements Serializable {initStage = null;}- public Url guessServerUrl() {+ public Url guessServerUrl(boolean ssh) {Url serverUrl = null;String serviceHost = System.getenv("ONEDEV_SERVICE_HOST");@@ -157,21 +162,27 @@ public class OneDev extends AbstractPlugin implements Serializable {}).checkReturnCode();- if (externalIpRef.get() != null) {+ String externalIp = externalIpRef.get();++ if (externalIp != null) {kubectl.clearArgs();kubectl.addArgs("get", "service", "onedev", "-o","jsonpath={range .spec.ports[*]}{.name} {.port}{'\\n'}{end}");- AtomicReference<String> httpPortRef = new AtomicReference<>(null);- AtomicReference<String> httpsPortRef = new AtomicReference<>(null);+ AtomicReference<Integer> httpPortRef = new AtomicReference<>(null);+ AtomicReference<Integer> httpsPortRef = new AtomicReference<>(null);+ AtomicReference<Integer> sshPortRef = new AtomicReference<>(null);kubectl.execute(new LineConsumer() {@Overridepublic void consume(String line) {String protocol = StringUtils.substringBefore(line, " ");+ int port = Integer.parseInt(StringUtils.substringAfter(line, " "));if (protocol.equals("http"))- httpPortRef.set(StringUtils.substringAfter(line, " "));+ httpPortRef.set(port);else if (protocol.equals("https"))- httpsPortRef.set(StringUtils.substringAfter(line, " "));+ httpsPortRef.set(port);+ else if (protocol.equals("ssh"))+ sshPortRef.set(port);}}, new LineConsumer() {@@ -183,13 +194,37 @@ public class OneDev extends AbstractPlugin implements Serializable {}).checkReturnCode();- serverUrl = buildServerUrl(externalIpRef.get(), httpPortRef.get(), httpsPortRef.get());+ Integer sshPort = sshPortRef.get();+ Integer httpPort = httpPortRef.get();+ Integer httpsPort = httpsPortRef.get();++ if (ssh) {+ if (sshPort != null)+ serverUrl = buildServerUrl(externalIp, "ssh", sshPort);+ } else if (httpsPort != null) {+ serverUrl = buildServerUrl(externalIp, "https", httpsPort);+ } else {+ serverUrl = buildServerUrl(externalIp, "http", httpPort);+ }}if (serverUrl == null) {- String httpPort = System.getenv("ONEDEV_SERVICE_PORT_HTTP");- String httpsPort = System.getenv("ONEDEV_SERVICE_PORT_HTTPS");- serverUrl = buildServerUrl(serviceHost, httpPort, httpsPort);+ String httpPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTP");+ String httpsPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTPS");+ String sshPortEnv = System.getenv("ONEDEV_SERVICE_PORT_SSH");++ Integer httpPort = httpPortEnv!=null?Integer.valueOf(httpPortEnv):null;+ Integer httpsPort = httpsPortEnv!=null?Integer.valueOf(httpsPortEnv):null;+ Integer sshPort = sshPortEnv!=null?Integer.valueOf(sshPortEnv):null;++ if (ssh) {+ if (sshPort != null)+ serverUrl = buildServerUrl(externalIp, "ssh", sshPort);+ } else if (httpsPort != null) {+ serverUrl = buildServerUrl(externalIp, "https", httpsPort);+ } else {+ serverUrl = buildServerUrl(externalIp, "http", httpPort);+ }}}@@ -217,31 +252,25 @@ public class OneDev extends AbstractPlugin implements Serializable {}}- if (serverConfig.getHttpsPort() != 0)- serverUrl = buildServerUrl(host, null, Integer.toString(serverConfig.getHttpsPort()));- else- serverUrl = buildServerUrl(host, Integer.toString(serverConfig.getHttpPort()), null);-+ ServerConfig serverConfig = serverConfigProvider.get();+ if (ssh)+ serverUrl = buildServerUrl(host, "ssh", serverConfig.getSshPort());+ else if (serverConfig.getHttpsPort() != 0)+ serverUrl = buildServerUrl(host, "https", serverConfig.getHttpsPort());+ else+ serverUrl = buildServerUrl(host, "http", serverConfig.getHttpPort());}return serverUrl;}- private Url buildServerUrl(String host, @Nullable String httpPort, @Nullable String httpsPort) {+ private Url buildServerUrl(String host, String protocol, int port) {Url serverUrl = new Url(Charset.forName("UTF8"));- boolean haveHttpPort = httpPort != null;- boolean haveHttpsPort = httpsPort != null;serverUrl.setHost(host);- serverUrl.setProtocol(haveHttpsPort ? "https" : "http");-- //Url class already strips out default ports (80, 443) in its toString method, so we don't need to check it.- if (haveHttpsPort || haveHttpPort ) {- serverUrl.setPort(haveHttpsPort ? Integer.parseInt(httpsPort) : Integer.parseInt(httpPort));- } else {- logger.warn("This OneDev deployment looks odd to me: "- + "both http and https port are not specified");- }+ serverUrl.setProtocol(protocol);+ if (!protocol.equals("ssh") || port != 22)+ serverUrl.setPort(port);return serverUrl;}@@ -292,8 +321,10 @@ public class OneDev extends AbstractPlugin implements Serializable {}persistManager.stop();- taskScheduler.stop();- jettyRunner.stop();+ if (Bootstrap.command == null) {+ taskScheduler.stop();+ jettyLauncherProvider.get().stop();+ }executorService.shutdown();}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 54826deaed..37e79ee3d5 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -30,6 +30,7 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.ZipUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;@@ -55,7 +56,6 @@ import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.ssh.SshKeyUtils;-import io.onedev.server.util.ServerConfig;import io.onedev.server.util.init.ManualConfig;import io.onedev.server.util.init.Skippable;import io.onedev.server.util.schedule.SchedulableTask;@@ -82,14 +82,11 @@ public class DefaultDataManager implements DataManager, Serializable {private String backupTaskId;- private ServerConfig serverConfig;-@Injectpublic DefaultDataManager(UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,- PasswordService passwordService, RoleManager roleManager,- ServerConfig serverConfig) {+ PasswordService passwordService, RoleManager roleManager) {this.userManager = userManager;this.settingManager = settingManager;this.validator = validator;@@ -98,7 +95,6 @@ public class DefaultDataManager implements DataManager, Serializable {this.mailManager = mailManager;this.passwordService = passwordService;this.roleManager = roleManager;- this.serverConfig = serverConfig;}@SuppressWarnings("serial")@@ -139,11 +135,11 @@ public class DefaultDataManager implements DataManager, Serializable {Setting setting = settingManager.getSetting(Key.SYSTEM);SystemSetting systemSetting = null;- Url serverUrl = OneDev.getInstance().guessServerUrl();+ Url webServerUrl = OneDev.getInstance().guessServerUrl(false);if (setting == null || setting.getValue() == null) {systemSetting = new SystemSetting();- systemSetting.setServerUrl(serverUrl.toString(StringMode.FULL));+ systemSetting.setServerUrl(webServerUrl.toString(StringMode.FULL));} else if (!validator.validate(setting.getValue()).isEmpty()) {systemSetting = (SystemSetting) setting.getValue();}@@ -172,13 +168,8 @@ public class DefaultDataManager implements DataManager, Serializable {setting = settingManager.getSetting(Key.SSH);if (setting == null || setting.getValue() == null) {SshSetting sshSetting = new SshSetting();- String sshUrl = serverUrl.getHost();- int sshPort = serverConfig.getSshPort();-- if (sshPort != 22)- sshUrl += ":" + sshPort;-- sshSetting.setServerUrl("ssh://" + sshUrl);+ Url sshServerUrl = OneDev.getInstance().guessServerUrl(true);+ sshSetting.setServerUrl(StringUtils.stripEnd(sshServerUrl.toString(StringMode.FULL), "/"));sshSetting.setPrivateKey(SshKeyUtils.generatePEMPrivateKey());settingManager.saveSshSetting(sshSetting);diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex 634cee6736..62786a2372 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -19,7 +19,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.PluginManager;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;@@ -47,7 +46,7 @@ public class Upgrade extends DefaultPersistManager {@Injectpublic Upgrade(PhysicalNamingStrategy physicalNamingStrategy,HibernateProperties properties, Interceptor interceptor,- IdManager idManager, Dao dao, EntityValidator validator, PluginManager pluginManager,+ IdManager idManager, Dao dao, EntityValidator validator,TransactionManager transactionManager) {super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator, transactionManager);}@@ -490,6 +489,11 @@ public class Upgrade extends DefaultPersistManager {String serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);if (serverProps.contains("sessionTimeout"))FileUtils.copyFile(new File(Bootstrap.getConfDir(), "server.properties"), serverPropsFile);+ serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);+ if (!serverProps.contains("ssh_port")) {+ serverProps += String.format("%n%nssh_port: 6611%n");+ FileUtils.writeStringToFile(serverPropsFile, serverProps, StandardCharsets.UTF_8);+ }File logbackPropsFile = new File(upgradeDir, "conf/logback.xml");String logbackProps = FileUtils.readFileToString(logbackPropsFile, StandardCharsets.UTF_8);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.javaindex 58b40dbe5a..cb0da9b262 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@@ -1843,7 +1843,14 @@ public class DataMigrator {}if (!hasOwnerRole) {File dataFile = new File(dataDir, "Roles.xml");- VersionedXmlDoc dom = VersionedXmlDoc.fromFile(dataFile);+ VersionedXmlDoc dom;+ if (dataFile.exists()) {+ dom = VersionedXmlDoc.fromFile(dataFile);+ } else {+ dom = new VersionedXmlDoc();+ dom.addElement("list");+ }+Element ownerRoleElement = dom.getRootElement().addElement("io.onedev.server.model.Role");ownerRoleElement.addAttribute("revision", "0.0");ownerRoleElement.addElement("id").setText("1");@@ -1975,7 +1982,13 @@ public class DataMigrator {}File dataFile = new File(dataDir, "UserAuthorizations.xml");- VersionedXmlDoc dom = VersionedXmlDoc.fromFile(dataFile);+ VersionedXmlDoc dom;+ if (dataFile.exists()) {+ dom = VersionedXmlDoc.fromFile(dataFile);+ } else {+ dom = new VersionedXmlDoc();+ dom.addElement("list");+ }for (Map.Entry<String, String> entry: projectOwners.entrySet()) {Element userAuthorizationElement = dom.getRootElement().addElement("io.onedev.server.model.UserAuthorization");userAuthorizationElement.addAttribute("revision", "0.0");diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.javarename to server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.javaindex f07341a220..1c6fb2904c 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java@@ -22,7 +22,7 @@ import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;@Singleton-public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextHandler> {+public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletContextHandler> {private static final int MAX_CONTENT_SIZE = 5000000;@@ -43,7 +43,7 @@ public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextH* Inject providers here to avoid circurlar dependencies when dependency graph gets complicated*/@Inject- public DefaultJettyRunner(+ public DefaultJettyLauncher(Provider<Set<ServerConfigurator>> serverConfiguratorsProvider,Provider<Set<ServletConfigurator>> servletConfiguratorsProvider) {this.serverConfiguratorsProvider = serverConfiguratorsProvider;@@ -57,7 +57,7 @@ public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextHservletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);servletContextHandler.setMaxFormContentSize(MAX_CONTENT_SIZE);- servletContextHandler.setClassLoader(DefaultJettyRunner.class.getClassLoader());+ servletContextHandler.setClassLoader(DefaultJettyLauncher.class.getClassLoader());servletContextHandler.setErrorHandler(new ErrorPageErrorHandler());servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/JettyRunner.java b/server-core/src/main/java/io/onedev/server/util/jetty/JettyLauncher.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/util/jetty/JettyRunner.javarename to server-core/src/main/java/io/onedev/server/util/jetty/JettyLauncher.javaindex 8d4ff297b4..72172ac644 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/JettyRunner.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/JettyLauncher.java@@ -1,6 +1,6 @@package io.onedev.server.util.jetty;-public interface JettyRunner {+public interface JettyLauncher {void start();diff --git a/server-product/docker/build.sh b/server-product/docker/build.shnew file mode 100755index 0000000000..685b839313--- /dev/null+++ b/server-product/docker/build.sh@@ -0,0 +1,14 @@+#!/bin/bash++set -e++cd ../target+rm -rf docker+cp -r ../docker docker+buildVersion=`ls onedev-*.zip|sed -e 's/onedev-\(.*\).zip/\1/'`++unzip onedev-$buildVersion.zip -d docker+mv docker/onedev-$buildVersion docker/app+cp sandbox/site/lib/mysql* sandbox/site/lib/postgresql* docker/app/site/lib++docker build -t 1dev/server:$buildVersion docker\ No newline at end of filediff --git a/server-product/k8s/base/deployments.yaml b/server-product/k8s/base/deployments.yamlindex 425c139aa0..4aa46cd645 100644--- a/server-product/k8s/base/deployments.yaml+++ b/server-product/k8s/base/deployments.yaml@@ -24,6 +24,7 @@ spec:name: onedevports:- containerPort: 6610+ - containerPort: 6611env:- name: hibernate_dialectvalue: org.hibernate.dialect.MySQL5InnoDBDialectdiff --git a/server-product/k8s/base/services.yaml b/server-product/k8s/base/services.yamlindex 26471e108b..c511be4678 100644--- a/server-product/k8s/base/services.yaml+++ b/server-product/k8s/base/services.yaml@@ -11,6 +11,10 @@ spec:port: 80targetPort: 6610protocol: TCP+ - name: ssh+ port: 22+ targetPort: 6611+ protocol: TCPselector:tier: server---diff --git a/server-product/k8s/build.sh b/server-product/k8s/build.shnew file mode 100755index 0000000000..fbf15c5b93--- /dev/null+++ b/server-product/k8s/build.sh@@ -0,0 +1,13 @@+#!/bin/bash++set -e++cd ../target++buildVersion=`ls onedev-*.zip|sed -e 's/onedev-\(.*\).zip/\1/'`++rm -rf k8s-resources+cp -r ../k8s k8s-resources+rm k8s-resources/build.sh+find k8s-resources -name "*.yaml" | xargs sed -i -e "s/\${buildVersion}/${buildVersion}/g"+zip -r k8s-resources.zip k8s-resourcesdiff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex 8c7d0aea57..82280c678f 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -48,7 +48,6 @@ public class DefaultServerConfig implements ServerConfig {private File keystoreFile;private String keystorePassword;-@Injectpublic DefaultServerConfig(ServerProperties props) {