Changes to dockerfile and start-oms for experimenting with interactin…

…g with kubernetes api server using go-client

docker-bits/6_jupyterlab.Dockerfile

@@ -103,6 +103,9 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \
     fix-permissions /home/$NB_USER
 
 # OpenM install
+# Need golang development kit to build hook and controller for mpijob execution.
+RUN apt-get install -y golang-go
+
 # Install OpenM++ MPI
 ARG OMPP_VERSION="1.15.5"
 # IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!

output/docker-stacks-datascience-notebook/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/jupyterlab-cpu/Dockerfile

@@ -255,6 +255,9 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \
     fix-permissions /home/$NB_USER
 
 # OpenM install
+# Need golang development kit to build hook and controller for mpijob execution.
+RUN apt-get install -y golang-go
+
 # Install OpenM++ MPI
 ARG OMPP_VERSION="1.15.5"
 # IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!

output/jupyterlab-cpu/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/jupyterlab-pytorch/Dockerfile

@@ -277,6 +277,9 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \
     fix-permissions /home/$NB_USER
 
 # OpenM install
+# Need golang development kit to build hook and controller for mpijob execution.
+RUN apt-get install -y golang-go
+
 # Install OpenM++ MPI
 ARG OMPP_VERSION="1.15.5"
 # IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!

output/jupyterlab-pytorch/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/jupyterlab-tensorflow/Dockerfile

@@ -384,6 +384,9 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \
     fix-permissions /home/$NB_USER
 
 # OpenM install
+# Need golang development kit to build hook and controller for mpijob execution.
+RUN apt-get install -y golang-go
+
 # Install OpenM++ MPI
 ARG OMPP_VERSION="1.15.5"
 # IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!

output/jupyterlab-tensorflow/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/remote-desktop/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/rstudio/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

output/sas/Dockerfile

@@ -257,6 +257,9 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \
     fix-permissions /home/$NB_USER
 
 # OpenM install
+# Need golang development kit to build hook and controller for mpijob execution.
+RUN apt-get install -y golang-go
+
 # Install OpenM++ MPI
 ARG OMPP_VERSION="1.15.5"
 # IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!

output/sas/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"
 

resources/common/start-oms.sh

@@ -80,7 +80,7 @@ if [ ! -d /openmpp ]
   git clone https://github.com/StatCan/openmpp.git
 fi
 cd openmpp
-branch="main"
+branch="openmpp-24"
 state=$(git symbolic-ref --short HEAD 2>&1)
 if [ $state != $branch ]
  then
@@ -89,10 +89,15 @@ fi
 git pull
 cd mpi-job-files
 
+
+
 # Copy scripts and templates into openmpp installation bin and etc folders:
 cp dispatchMPIJob.sh parseCommand.py "$OM_ROOT/bin/"
 cp mpi.kubeflow.template.txt MPIJobTemplate.yaml "$OM_ROOT/etc/"
 
+# Copy golang source files into etc for experimentation for now:
+cp -r mpiJobHook "$OM_ROOT/etc/"
+
 # Delete the default mpi golang template that does not work in our context:
 rm -f "$OM_ROOT/etc/mpi.ModelRun.template.txt"