Address review feedback: remove templates, move nvm to developer.sh, remove telegraf and microk8s

Co-authored-by: prasadtalasila <9206466+prasadtalasila@users.noreply.github.com>

Author: Copilot

deploy/vagrant/CHANGELOG.md

@@ -34,10 +34,10 @@ are not a developer, no changes are required to the `Vagrantfile`.
 This vagrant box installed for users will have the following items:
 
 * docker (with docker compose plugin)
-* nodejs v22 (via nvm)
+* nodejs v20.10
 * yarn v1.22
-* npm global packages: serve, pm2, madge
-* python3 with venv
+* npm v10.2
+* python3 with pip
 * containers
   * ml-workspace-minimal v0.13.2
   * traefik v2.10
@@ -51,14 +51,14 @@ This vagrant box installed for users will have the following items:
 This vagrant box installed for developers will have
 the following items additional items:
 
-* microk8s v1.27
+* nodejs v22 (via nvm)
+* npm global packages: serve, pm2, madge
 * jupyterlab (in python venv)
 * mkdocs (in python venv)
 * shellcheck
 * markdownlint (mdl)
 * graphviz
 * containers
-  * telegraf v1.28.2
   * gitlab-runner alpine-v17.5.3
 
 The upcoming instructions will help with the creation of

deploy/vagrant/make_boxes/dtaas/README.md

@@ -12,6 +12,27 @@ apt-get upgrade -y
 # mkcert can be installed from: https://github.com/FiloSottile/mkcert
 apt-get install -y wget openssl
 
+# Install nodejs using nvm
+apt-get install -y ca-certificates curl gnupg
+
+# Install nvm for vagrant user
+sudo -u vagrant bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash'
+sudo -u vagrant bash -c 'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install 22 && nvm use 22 && nvm alias default 22'
+
+# Install yarn
+if [ ! -f /usr/share/keyrings/yarnkey.gpg ]
+then
+  curl -sL "https://dl.yarnpkg.com/debian/pubkey.gpg" | gpg --dearmor | \
+    tee /usr/share/keyrings/yarnkey.gpg >/dev/null
+  printf "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main \n" | \
+    tee /etc/apt/sources.list.d/yarn.list
+fi
+apt-get update -y
+apt-get install -y yarn
+
+# Install global npm packages
+sudo -u vagrant bash -c 'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && npm install -g serve pm2 madge'
+
 # Install playwright tool for integration tests on browsers
 npx --yes playwright install-deps
 
@@ -21,14 +42,7 @@ printf "\n\n Install jupyterlab and mkdocs"
 sudo -u vagrant bash -c 'cd /home/vagrant && python3 -m venv ./dtaas-venv'
 sudo -u vagrant bash -c 'cd /home/vagrant && ./dtaas-venv/bin/pip3 install jupyterlab mkdocs mkdocs-material python-markdown-math mkdocs-open-in-new-tab mkdocs-with-pdf qrcode'
 
-# Install minimal Kubernetes cluster
-snap install microk8s --classic
-usermod -a -G microk8s vagrant
-chown -f -R vagrant ~/.kube
-newgrp microk8s
-
 # get the required docker images
-docker pull telegraf:1.28.2
 docker pull gitlab/gitlab-runner:alpine-v17.5.3
 
 # Install markdownlint
@@ -40,4 +54,4 @@ sudo apt-get install -y shellcheck
 
 # Install madge for generating dependency graphs of typescript projects
 sudo apt-get install -y graphviz
-# madge is already installed via npm in user.sh
+# madge is already installed via npm above

deploy/vagrant/make_boxes/dtaas/developer.sh

@@ -15,8 +15,7 @@ apt-get install -y \
     apache2-utils \
     net-tools \
     python3-dev \
-    python3-pip \
-    python3-venv
+    python3-pip
 
 mkdir -p /etc/apt/keyrings
 if [ ! -f /etc/apt/keyrings/docker.gpg ]
@@ -40,14 +39,22 @@ docker run hello-world
 systemctl enable docker.service
 systemctl enable containerd.service
 
-# Install nodejs using nvm
+apt-get update
 apt-get install -y ca-certificates curl gnupg
+mkdir -p /etc/apt/keyrings
+if [ ! -f /etc/apt/keyrings/nodesource.gpg ]
+then
+  curl -fsSL "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" | \
+    gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+fi
+NODE_MAJOR=20
+printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] \
+  https://deb.nodesource.com/node_%s.x nodistro main" "$NODE_MAJOR" | \
+  tee /etc/apt/sources.list.d/nodesource.list
+apt-get update
+apt-get install -y nodejs
+npm install -g npm@10.2.0
 
-# Install nvm for vagrant user
-sudo -u vagrant bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash'
-sudo -u vagrant bash -c 'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install 22 && nvm use 22 && nvm alias default 22'
-
-# Install yarn
 if [ ! -f /usr/share/keyrings/yarnkey.gpg ]
 then
   curl -sL "https://dl.yarnpkg.com/debian/pubkey.gpg" | gpg --dearmor | \
@@ -57,9 +64,7 @@ then
 fi
 apt-get update -y
 apt-get install -y yarn
-
-# Install global npm packages
-sudo -u vagrant bash -c 'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && npm install -g serve pm2 madge'
+npm install -g serve
 
 cat /vagrant/vagrant.pub >> /home/vagrant/.ssh/authorized_keys
 mkdir -p /root/.ssh

deploy/vagrant/make_boxes/dtaas/user.sh

@@ -18,18 +18,12 @@ Please follow these steps to make this work in your local environment.
    This shall be useful for logging into the vagrant machine
    created for single-machine deployment.
 
-1. Copy the Vagrantfile template and customize it:
-   ```bash
-   cp ../templates/Vagrantfile.single-machine.template Vagrantfile
-   ```
-   Update the **Vagrantfile** as needed. Fields to customize are:
+1. Update the **Vagrantfile**. Fields to update are:
     1. Hostname (`node.vm.hostname = "foo.com"`)
     1. MAC address (`:mac => "xxxxxxxx"`). This change is required
        if you have a DHCP server assigning domain names based on MAC
        address. Otherwise, you can leave this field unchanged.
-    1. Path to vagrant private key (`node.ssh.private_key_path = "vagrant"`)
     1. Other adjustments are optional.
-
 1. Execute the following commands from terminal
 
 ```bash