From ed2cabea31f3aa69fe781f6ebef62919c317473f Mon Sep 17 00:00:00 2001 From: cdmikechen Date: Sat, 25 Nov 2023 10:29:36 +0800 Subject: [PATCH] change container command version --- .../submarine/commons/utils/SubmarineConfVars.java | 4 ++-- .../submitter/k8s/ExperimentSpecParserTest.java | 13 +++++++++---- .../client/notebook/notebook-read-api.json | 2 +- .../submarine/rest/ExperimentRestApiTest.java | 9 +++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java index 52a35ebad5..f778bf5bd4 100644 --- a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java +++ b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java @@ -83,8 +83,8 @@ public enum ConfVars { "org.apache.submarine.server.submitter.yarn.YarnRuntimeFactory"), SUBMARINE_SUBMITTER("submarine.submitter", "k8s"), SUBMARINE_SERVER_SERVICE_NAME("submarine.server.service.name", "submarine-server"), - ENVIRONMENT_CONDA_MIN_VERSION("environment.conda.min.version", "4.0.1"), - ENVIRONMENT_CONDA_MAX_VERSION("environment.conda.max.version", "4.11.10"), + ENVIRONMENT_CONDA_MIN_VERSION("environment.conda.min.version", "23.1.0"), + ENVIRONMENT_CONDA_MAX_VERSION("environment.conda.max.version", "23.12.10"), /* cookie setting */ SUBMARINE_COOKIE_HTTP_ONLY("submarine.cookie.http.only", false), diff --git a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java index 34ffd356b0..8694d23353 100644 --- a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java +++ b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java @@ -63,6 +63,9 @@ import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource; import io.kubernetes.client.openapi.models.V1EnvVar; +import static org.apache.submarine.commons.utils.SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MAX_VERSION; +import static org.apache.submarine.commons.utils.SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MIN_VERSION; + public class ExperimentSpecParserTest extends SpecBuilder { @@ -359,11 +362,11 @@ public void testValidPyTorchJobSpecWithEnv() String minVersion = "minVersion=\"" + conf.getString( - SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MIN_VERSION) + ENVIRONMENT_CONDA_MIN_VERSION) + "\";"; String maxVersion = "maxVersion=\"" + conf.getString( - SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MAX_VERSION) + ENVIRONMENT_CONDA_MAX_VERSION) + "\";"; String currentVersion = "currentVersion=$(conda -V | cut -f2 -d' ');"; Assert.assertEquals( @@ -371,8 +374,10 @@ public void testValidPyTorchJobSpecWithEnv() + "if [ \"$(printf '%s\\n' \"$minVersion\" \"$maxVersion\" " + "\"$currentVersion\" | sort -V | head -n2 | tail -1 )\" " + "!= \"$currentVersion\" ]; then echo \"Conda version " + - "should be between minVersion=\"4.0.1\"; " + - "and maxVersion=\"4.11.10\";\"; exit 1; else echo " + "should be between minVersion=\"" + + ENVIRONMENT_CONDA_MIN_VERSION.getStringValue() + "\"; " + + "and maxVersion=\"" + ENVIRONMENT_CONDA_MAX_VERSION.getStringValue() + + "\";\"; exit 1; else echo " + "\"Conda current version is " + currentVersion + ". " + "Moving forward with env creation and activation.\"; " + "fi && " + diff --git a/submarine-server/server-submitter/submitter-k8s/src/test/resources/client/notebook/notebook-read-api.json b/submarine-server/server-submitter/submitter-k8s/src/test/resources/client/notebook/notebook-read-api.json index db66194093..7757b703e9 100644 --- a/submarine-server/server-submitter/submitter-k8s/src/test/resources/client/notebook/notebook-read-api.json +++ b/submarine-server/server-submitter/submitter-k8s/src/test/resources/client/notebook/notebook-read-api.json @@ -27,7 +27,7 @@ }, { "name": "INSTALL_ENVIRONMENT_COMMAND", - "value": "minVersion=\"4.0.1\";maxVersion=\"4.11.10\";currentVersion=$(conda -V | cut -f2 -d' ');if [ \"$(printf '%s\\n' \"$minVersion\" \"$maxVersion\" \"$currentVersion\" | sort -V | head -n2 | tail -1 )\" != \"$currentVersion\" ]; then echo \"Conda version should be between minVersion=\"4.0.1\"; and maxVersion=\"4.11.10\";\"; exit 1; else echo \"Conda current version is currentVersion=$(conda -V | cut -f2 -d' ');. Moving forward with env creation and activation.\"; fi" + "value": "minVersion=\"23.1.0\";maxVersion=\"23.12.10\";currentVersion=$(conda -V | cut -f2 -d' ');if [ \"$(printf '%s\\n' \"$minVersion\" \"$maxVersion\" \"$currentVersion\" | sort -V | head -n2 | tail -1 )\" != \"$currentVersion\" ]; then echo \"Conda version should be between minVersion=\"23.1.0\"; and maxVersion=\"23.12.10\";\"; exit 1; else echo \"Conda current version is currentVersion=$(conda -V | cut -f2 -d' ');. Moving forward with env creation and activation.\"; fi" } ], "image": "syharbor.sypesco.com:5000/apache/submarine:jupyter-notebook-0.7.0-syzh", diff --git a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiTest.java b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiTest.java index 1c07604da7..0846a65b84 100644 --- a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiTest.java +++ b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiTest.java @@ -65,6 +65,9 @@ import io.kubernetes.client.util.ClientBuilder; import io.kubernetes.client.util.KubeConfig; +import static org.apache.submarine.commons.utils.SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MAX_VERSION; +import static org.apache.submarine.commons.utils.SubmarineConfVars.ConfVars.ENVIRONMENT_CONDA_MIN_VERSION; + @SuppressWarnings("rawtypes") public class ExperimentRestApiTest extends AbstractSubmarineServerTest { private static final Logger LOG = LoggerFactory.getLogger(ExperimentRestApiTest.class); @@ -343,8 +346,10 @@ private void assertK8sResultEquals(Environment env, Experiment experiment) throw + "if [ \"$(printf '%s\\n' \"$minVersion\" \"$maxVersion\" " + "\"$currentVersion\" | sort -V | head -n2 | tail -1 )\" " + "!= \"$currentVersion\" ]; then echo \"Conda version " + - "should be between minVersion=\"4.0.1\"; " + - "and maxVersion=\"4.11.10\";\"; exit 1; else echo " + "should be between minVersion=\"" + + ENVIRONMENT_CONDA_MIN_VERSION.getStringValue() + "\"; " + + "and maxVersion=\"" + ENVIRONMENT_CONDA_MAX_VERSION.getStringValue() + + "\";\"; exit 1; else echo " + "\"Conda current version is " + currentVersion + ". " + "Moving forward with env creation and activation.\"; " + "fi && ";