...
 
Commits (5)
Use deploy to deploy the analytics toolkit.
use
--docker-skip to avoid building the docker image
--update-docker to build a new docker image and update version_to_deploy
--tsl to use the secure connection for helm
With minikube do
......@@ -11,10 +11,15 @@ With minikube do
machine specific deploy:
# labtest-nomad
cd /nomad/nomadlab/servers/labtest-nomad/beaker-manager/deploy
./deploy.sh --tls --env labtest-nomad --update-docker --secret-web-certs web-certs > deploy.cmds
# labdev-nomad
cd /nomad/nomadlab/servers/labdev-nomad/analytics/beaker
./deploy/deploy.sh --env labdev-nomad --target-hostname labdev-nomad --secret-web-certs web-certs --debug
./deploy/deploy.sh --env labdev-nomad --target-hostname labdev-nomad --secret-web-certs web-certs --debug > deploy/deploy.cmds
development machine, deploy mirroring the filesystem, you might need to manully execute npm install in the container to if you update packages
......
......@@ -237,9 +237,9 @@ module.exports = function(config, models){
logger.info('starting watcher')
var watcher = chokidar.watch(config.userInfo.basePathToWatch+ '/**/*.bkr', {
usePolling: true, // more expensive, but works also on GPFS with updates from multiple machines
interval: 1000,
binaryInterval: 3000
usePolling: config.watcher.usePolling, // more expensive, but works also on GPFS with updates from multiple machines
interval: config.watcher.interval,
binaryInterval: config.watcher.binaryInterval
});
watcher.on('add', (path,stats) => {
addNewNotebook(path, stats)
......
......@@ -10,6 +10,11 @@
"ca": "KUBERNETES_CA"
"cert": "KUBERNETES_CERT"
"key": "KUBERNETES_KEY"
}
"k8component": {
"image": "IMAGE_DEFAULT"
"imageSubtype": "IMAGE_SUBTYPE"
"imageReStr": "IMAGE_RE_STR"
}
mongoDb: {
url: "MONGODB_URL"
......
......@@ -2,7 +2,7 @@ k8component: {
image: {
imageType: beaker
imageSubtype: default1
image: "analytics-toolkit.nomad-coe.eu:5509/nomadlab/notebook:v1.11.6-229-g19da90a7-dirty"
image: "gitlab-registry.mpcdf.mpg.de/nomad-lab/nomad-lab-base/notebook:2.0.0"
port: 8801,
prefix: "/beaker",
healthPath: "/beaker"
......
......@@ -94,3 +94,8 @@ userInfo: {
sharedDirInContainer: "/data/shared"
mySharedDirInContainer: "/data/my-shared"
}
watcher{
usePolling: true
interval: 2000
binaryInterval: 6000
}
\ No newline at end of file
......@@ -70,7 +70,8 @@ done
chownRoot=${chownRoot:-$nomadRoot/servers/$target_hostname}
if [ -n "$buildDocker" ] ; then
git describe --tags --always --dirty > version_to_deploy
v=$(git describe --tags --always --dirty)
echo $v > version_to_deploy
fi
version=$(cat version_to_deploy)
name="gitlab-registry.mpcdf.mpg.de/nomad-lab/container-manager:$version"
......@@ -455,7 +456,7 @@ echo "# create secret with web certificates"
echo " if [ -f web-certs/key.pem ] ; then"
echo " pushd web-certs"
echo " elif [ -f ../../web-certs/key.pem ]; then"
echo " pushd ../web-certs"
echo " pushd ../../web-certs"
echo " elif [ -f ../../../web-certs/key.pem ]; then"
echo " pushd ../../../web-certs"
echo " else"
......