Closed mesosphere-ci closed 3 years ago
Release data-science-engine 2.1.0 (automated commit)
Description: Source URL: https://infinity-artifacts.s3.amazonaws.com/permanent/data-science-engine/assets/2.1.0/stub-universe-data-science-engine.json
Changes between revisions 200 => 300: 0 files added: [] 0 files removed: [] 4 files changed:
--- 200/config.json +++ 300/config.json @@ -113,6 +113,31 @@ "TensorFlow-2.1.0" ], "default": "TensorFlow-2.1.0" + }, + "pod-replacement-failure-policy": { + "type": "object", + "title": "Pod Replacement Failure Policy", + "description": "Options relating to automatic pod-replacement failure policies with external-volumes.", + "properties": { + "enable-automatic-pod-replacement": { + "type": "boolean", + "title": "Enable Automatic Pod Replacement", + "description": "Determines whether pods should be replaced automatically on failure.", + "default": false + }, + "permanent-failure-timeout-secs": { + "type": "integer", + "title": "Permanent Failure Timeout", + "description": "Time in seconds to wait before declaring a task as permanently failed.", + "default": 120 + }, + "min-replace-delay-secs": { + "type": "integer", + "title": "Minimun Replace Delay", + "description": "Minimum Time in seconds to wait between destructive task recoveries.", + "default": 240 + } + } }, "log_level": { "type": "string", @@ -129,6 +154,22 @@ "ALL" ], "default": "INFO" + }, + "logrotate_options": { + "description": "The logrotate options for the DC/OS service.", + "type": "object", + "properties": { + "stdout_max_size": { + "description": "Logrotate stdout max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.", + "type": "string", + "default": "8MB" + }, + "stderr_max_size": { + "description": "Logrotate stderr max size. Sizes must be an integer of less than 2^64 and must be suffixed with a unit such as B (bytes), KB, MB, GB, or TB. There should be no whitespace between the integer and unit.", + "type": "string", + "default": "8MB" + } + } } }, "required": [ @@ -385,6 +426,43 @@ } } }, + "external_volume": { + "type": "object", + "title": "External Volumes", + "description": "Options related to use of external volumes.", + "properties": { + "enabled": { + "title": "Enable External Volume?", + "description": "Use external volumes over volumes managed by Mesos.", + "type": "boolean", + "default": false + }, + "driver_name": { + "title": "Driver Name", + "description": "Name of the external volume driver. e.g. pxd or netapp", + "type": "string", + "default": "pxd" + }, + "volume_name": { + "title": "Volume Name", + "description": "Name of the external volume. If empty service path will be used.", + "type": "string", + "default": "" + }, + "volume_driver_options": { + "title": "Volume Driver Options", + "description": "Options for volume driver", + "type": "string", + "default": "size=10" + }, + "volume_path": { + "title": "Volume Path", + "description": "Path at which to produce the volume (relative to the Mesos Sandbox) within the container", + "type": "string", + "default": "jupyter_data" + } + } + }, "s3": { "type": "object", "title": "S3 Object Store Configuration", @@ -778,12 +856,6 @@ "description": "Always force a pull of the Mesosphere Data Toolkit (Worker) Docker Image?", "default": false }, - "home": { - "type": "string", - "title": "Home Directory", - "description": "Your Home Directory (HOME)", - "default": "/mnt/mesos/sandbox" - }, "sandbox": { "type": "string", "title": "Sandbox Directory", @@ -795,36 +867,6 @@ "title": "Haddop Configuration Directory", "description": "Hadoop Configuration Directory (HADOOP_CONF_DIR)", "default": "/mnt/mesos/sandbox/hadoop_conf" - }, - "jupyter_config_dir": { - "type": "string", - "title": "Data Science Engine Notebook Configuration Directory", - "description": "Data Science Engine Notebook Configuration Directory (JUPYTER_CONFIG_DIR)", - "default": "/mnt/mesos/sandbox/.jupyter" - }, - "jupyter_runtime_dir": { - "type": "string", - "title": "Data Science Engine Notebook Runtime Directory", - "description": "Data Science Engine Notebook Runtime Directory (JUPYTER_RUNTIME_DIR)", - "default": "/mnt/mesos/sandbox/.local/share/jupyter/runtime" - }, - "conda_envs_path": { - "type": "string", - "title": "Conda Environment Paths", - "description": "Conda Environment Paths (CONDA_ENVS_PATH)", - "default": "/mnt/mesos/sandbox/conda/envs:/opt/conda/envs" - }, - "conda_pkgs_dir": { - "type": "string", - "title": "Conda Package Directory Paths", - "description": "Conda Package Directory Paths (CONDA_PKGS_DIRS)", - "default": "/mnt/mesos/sandbox/conda/pkgs,/opt/conda/pkgs" - }, - "dcos_dir": { - "type": "string", - "title": "DC/OS CLI Configuration Directory", - "description": "DC/OS CLI Config Directory (DCOS_DIR)", - "default": "/mnt/mesos/sandbox/.dcos" }, "java_opts": { "type": "string", @@ -854,12 +896,6 @@ "title": "TensorBoard Log Directory", "description": "TensorBoard Log Directory - e.g., hdfs://hdfs/ or s3://path/to/bucket", "default": "/mnt/mesos/sandbox" - }, - "term": { - "type": "string", - "title": "Terminal (TTY) Type", - "description": "Unix Terminal Type", - "default": "xterm-256color" } } } --- 200/marathon.json.mustache +++ 300/marathon.json.mustache @@ -33,9 +33,9 @@ {{/service.service_account_secret}} "TASKCFG_ALL_PORT_SPARKHISTORY": "18080", "PACKAGE_NAME": "data-science-engine", - "PACKAGE_VERSION": "2.0.1", - "PACKAGE_BUILD_TIME_EPOCH_MS": "1596206899499", - "PACKAGE_BUILD_TIME_STR": "Fri Jul 31 2020 14:48:19 +0000", + "PACKAGE_VERSION": "2.1.0", + "PACKAGE_BUILD_TIME_EPOCH_MS": "1605389833144", + "PACKAGE_BUILD_TIME_STR": "Sat Nov 14 2020 21:37:13 +0000", "JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}", "BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}", @@ -46,11 +46,17 @@ "JUPYTER_CMD": "{{{service.cmd}}}", "JUPYTER_PLACEMENT": "{{service.placement_constraints}}", + + "POD_REPLACEMENT_FAILURE_POLICY_ENABLED": "{{service.pod-replacement-failure-policy.enable-automatic-pod-replacement}}", + "PERMANENT_FAILURE_TIMEOUT": "{{service.pod-replacement-failure-policy.permanent-failure-timeout-secs}}", + "MIN_REPLACE_DELAY": "{{service.pod-replacement-failure-policy.min-replace-delay-secs}}", "JUPYTER_NOTEBOOK_TYPE": "{{service.jupyter_notebook_type}}", {{#advanced.jupyter_notebook_image}} "JUPYTER_NOTEBOOK_IMAGE": "{{advanced.jupyter_notebook_image}}", {{/advanced.jupyter_notebook_image}} + "CONTAINER_LOGGER_LOGROTATE_MAX_STDOUT_SIZE": "{{service.logrotate_options.stdout_max_size}}", + "CONTAINER_LOGGER_LOGROTATE_MAX_STDERR_SIZE": "{{service.logrotate_options.stderr_max_size}}", "NOTEBOOK_MXNET": "{{resource.assets.container.docker.jupyterlab-spark-horovod-mxnet}}", "NOTEBOOK_PYTORCH": "{{resource.assets.container.docker.jupyterlab-spark-horovod-pytorch}}", @@ -67,15 +73,45 @@ "STORAGE_HOST_PATH_PATH": "{{storage.host_path.path}}", {{/storage.host_path.enabled}} + {{#storage.external_volume.enabled}} + "STORAGE_EXTERNAL_VOLUME_ENABLED": "{{storage.external_volume.enabled}}", + "STORAGE_EXTERNAL_VOLUME_DRIVER_NAME": "{{storage.external_volume.driver_name}}", + "STORAGE_EXTERNAL_VOLUME_NAME": "{{storage.external_volume.volume_name}}", + "STORAGE_EXTERNAL_VOLUME_DRIVER_OPTIONS": "{{storage.external_volume.volume_driver_options}}", + "STORAGE_EXTERNAL_VOLUME_PATH": "{{storage.external_volume.volume_path}}", + + "TASKCFG_ALL_JUPYTER_NOTEBOOK_DIR": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}", + "TASKCFG_ALL_CONDA_ENVS_PATH": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}/conda/envs:/opt/conda/envs", + "TASKCFG_ALL_CONDA_PKGS_DIRS": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}/conda/pkgs,/opt/conda/pkgs", + "TASKCFG_ALL_DCOS_DIR": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}/.dcos", + "TASKCFG_ALL_HOME": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}", + "TASKCFG_ALL_JUPYTER_CONFIG_DIR": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}/.jupyter", + "TASKCFG_ALL_JUPYTER_RUNTIME_DIR": "{{advanced.sandbox}}/{{storage.external_volume.volume_path}}/.local/share/jupyter/runtime", + {{/storage.external_volume.enabled}} + {{^storage.external_volume.enabled}} {{#storage.local_persistence.enabled}} "STORAGE_LOCAL_PERSISTENCE_ENABLED" : "{{storage.local_persistence.enabled}}", "STORAGE_LOCAL_PERSISTENCE_VOLUME_PATH": "{{storage.local_persistence.volume_path}}", "STORAGE_LOCAL_PERSISTENCE_VOLUME_SIZE": "{{storage.local_persistence.volume_size}}", + "TASKCFG_ALL_JUPYTER_NOTEBOOK_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}", + "TASKCFG_ALL_CONDA_ENVS_PATH": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/conda/envs:/opt/conda/envs", + "TASKCFG_ALL_CONDA_PKGS_DIRS": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/conda/pkgs,/opt/conda/pkgs", + "TASKCFG_ALL_DCOS_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.dcos", + "TASKCFG_ALL_HOME": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}", + "TASKCFG_ALL_JUPYTER_CONFIG_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.jupyter", + "TASKCFG_ALL_JUPYTER_RUNTIME_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.local/share/jupyter/runtime", {{/storage.local_persistence.enabled}} {{^storage.local_persistence.enabled}} "TASKCFG_ALL_JUPYTER_NOTEBOOK_DIR": "{{advanced.sandbox}}", + "TASKCFG_ALL_CONDA_ENVS_PATH": "{{advanced.sandbox}}/conda/envs:/opt/conda/envs", + "TASKCFG_ALL_CONDA_PKGS_DIRS": "{{advanced.sandbox}}/conda/pkgs,/opt/conda/pkgs", + "TASKCFG_ALL_DCOS_DIR": "{{advanced.sandbox}}/.dcos", + "TASKCFG_ALL_HOME": "{{advanced.sandbox}}", + "TASKCFG_ALL_JUPYTER_CONFIG_DIR": "{{advanced.sandbox}}/.jupyter", + "TASKCFG_ALL_JUPYTER_RUNTIME_DIR": "{{advanced.sandbox}}/.local/share/jupyter/runtime", {{/storage.local_persistence.enabled}} + {{/storage.external_volume.enabled}} {{#security.kerberos.enabled}} "TASKCFG_ALL_KERBEROS_ENABLED": "true", @@ -178,26 +214,9 @@ "TASKCFG_ALL_VIRTUAL_NETWORK_PLUGIN_LABELS": "{{networking.virtual_network_plugin_labels}}", {{/networking.virtual_network_plugin_labels}} {{/networking.virtual_network_enabled}} - {{#storage.local_persistence.enabled}} - "TASKCFG_ALL_CONDA_ENVS_PATH": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/conda/envs:/opt/conda/envs", - "TASKCFG_ALL_CONDA_PKGS_DIRS": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/conda/pkgs,/opt/conda/pkgs", - "TASKCFG_ALL_DCOS_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.dcos", + + "TASKCFG_ALL_JAVA_OPTS": "'{{advanced.java_opts}}'", "TASKCFG_ALL_HADOOP_CONF_DIR": "{{advanced.hadoop_conf_dir}}", - "TASKCFG_ALL_HOME": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}", - "TASKCFG_ALL_JUPYTER_CONFIG_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.jupyter", - "TASKCFG_ALL_JUPYTER_RUNTIME_DIR": "{{advanced.sandbox}}/{{storage.local_persistence.volume_path}}/.local/share/jupyter/runtime", - {{/storage.local_persistence.enabled}} - {{^storage.local_persistence.enabled}} - "TASKCFG_ALL_CONDA_ENVS_PATH": "{{advanced.conda_envs_path}}", - "TASKCFG_ALL_CONDA_PKGS_DIRS": "{{advanced.conda_pkgs_dir}}", - "TASKCFG_ALL_DCOS_DIR": "{{advanced.dcos_dir}}", - "TASKCFG_ALL_HADOOP_CONF_DIR": "{{advanced.hadoop_conf_dir}}", - "TASKCFG_ALL_HOME": "{{advanced.home}}", - "TASKCFG_ALL_JUPYTER_CONFIG_DIR": "{{advanced.jupyter_config_dir}}", - "TASKCFG_ALL_JUPYTER_RUNTIME_DIR": "{{advanced.jupyter_runtime_dir}}", - {{/storage.local_persistence.enabled}} - - "TASKCFG_ALL_JAVA_OPTS": "'{{advanced.java_opts}}'", {{#service.jupyter_conf_urls}} "TASKCFG_ALL_JUPYTER_CONF_URLS": "{{service.jupyter_conf_urls}}", @@ -394,7 +413,6 @@ "TASKCFG_ALL_HAPROXY_PATH": "/service/{{service.name}}", {{/networking.ingress.enabled}} - "TASKCFG_ALL_TERM": "{{advanced.term}}", "TASKCFG_ALL_USER": "root" }, "labels": { --- 200/package.json +++ 300/package.json @@ -2,7 +2,7 @@ "packagingVersion": "4.0", "minDcosReleaseVersion": "1.12", "name": "data-science-engine", - "version": "2.0.1", + "version": "2.1.0", "scm": "https://github.com/mesosphere/jupyter-service", "maintainer": "support+data-science-engine@mesosphere.com", "website": "https://docs.mesosphere.com/services/data-science-engine", @@ -10,10 +10,10 @@ "framework": true, "selected": true, "upgradesFrom": [ - "2.0.0" + "*" ], "downgradesTo": [ - "2.0.0" + "*" ], "tags": [ "hdfs", @@ -41,5 +41,5 @@ "url": "https://www.apache.org/licenses/LICENSE-2.0" } ], - "lastUpdated": 1596206901 + "lastUpdated": 1605389841 }--- 200/resource.json +++ 300/resource.json @@ -11,9 +11,9 @@ "uris": { "jre-tar-gz": "https://downloads.mesosphere.com/java/openjdk-jre-11.0.3.7-hotspot-linux-x64.tar.gz", "libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.14-beta.tar.gz", - "bootstrap-zip": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/bootstrap.zip", - "scheduler-zip": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/data-science-engine-scheduler.zip", - "init-sh": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/init.sh" + "bootstrap-zip": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/bootstrap.zip", + "scheduler-zip": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/data-science-engine-scheduler.zip", + "init-sh": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/init.sh" }, "container": { "docker": { @@ -48,7 +48,7 @@ } ], "kind": "executable", - "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/dcos-service-cli-darwin" + "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/dcos-service-cli-darwin" } }, "linux": { @@ -60,7 +60,7 @@ } ], "kind": "executable", - "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/dcos-service-cli-linux" + "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/dcos-service-cli-linux" } }, "windows": { @@ -72,7 +72,7 @@ } ], "kind": "executable", - "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.0.1/dcos-service-cli.exe" + "url": "https://downloads.mesosphere.com/data-science-engine/assets/2.1.0/dcos-service-cli.exe" } } }
Release data-science-engine 2.1.0 (automated commit)
Description: Source URL: https://infinity-artifacts.s3.amazonaws.com/permanent/data-science-engine/assets/2.1.0/stub-universe-data-science-engine.json
Changes between revisions 200 => 300: 0 files added: [] 0 files removed: [] 4 files changed: