Rework towards launch on Kubernetes

JMGaljaard · Mar 28, 2022 · e2338bc · e2338bc
1 parent 667b2c0
commit e2338bc
Show file tree

Hide file tree

Showing 26 changed files with 76 additions and 595 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,42 +1,32 @@
-# Base image to start with
 FROM ubuntu:20.04
- 
+
 # Who maintains this DockerFile
-MAINTAINER Bart Cox <b.a.cox@tudelft.nl>
+MAINTAINER Jeroen Galjaard <J.M.Galjaard-1@student.tudelft.nl>
 
 # Run build without interactive dialogue
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Set required environmental variables for the working setup.
+# Set environment variables for GLOO and TP (needed for RPC calls)
 ENV GLOO_SOCKET_IFNAME=eth0
 ENV TP_SOCKET_IFNAME=eth0
 
 # Define the working directory of the current Docker container
 WORKDIR /opt/federation-lab
 
-# Update the Ubuntu software repository
+# Update the Ubuntu software repository and fetch packages
 RUN apt-get update \
   && apt-get install -y vim curl python3 python3-pip net-tools iproute2
 
-#COPY data/ ./data
-#COPY default_models ./default_models
-# Copy the current folder to the working directory
-ADD setup.py requirements.txt ./
-
 # Use cache for pip, otherwise we repeatedly pull from repository
+ADD setup.py requirements.txt ./
 RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -r requirements.txt
 
 ADD configs configs
-
 ADD fltk fltk
+ADD scripts scripts
 
-
-# Install newest version of library
-RUN python3 -m setup install
-
-# Expose the container's port to the host OS
+# Expose default port 5000 to the host OS.
 EXPOSE 5000
 
-
 # Update relevant runtime configuration for experiment
 COPY cloud_configs/cloud_experiment.yaml configs/cloud_config.yaml
diff --git a/charts/README.md b/charts/README.md
@@ -1 +1,2 @@
-This chart was created by Kompose
+# FLTK Helm charts
+
diff --git a/cloud_configs/cloud_experiment.yaml b/cloud_configs/cloud_experiment.yaml
diff --git a/configs/example_cloud_experiment.json b/configs/example_cloud_experiment.json
@@ -7,13 +7,16 @@
       },
       "client": {
          "prefix": "client",
-         "tensorboard_active": true
+         "tensorboard_active": false
       }
    },
    "execution_config": {
       "experiment_prefix": "cloud_experiment",
-      "tensorboard_active": true,
       "cuda": false,
+      "tensorboard": {
+         "active": true,
+         "record_dir": true
+      },
       "net": {
          "save_model": false,
          "save_temp_model": false,

diff --git a/deploy/templates/client_stub_default.yml b/deploy/templates/client_stub_default.yml
diff --git a/deploy/templates/client_stub_medium.yml b/deploy/templates/client_stub_medium.yml
diff --git a/deploy/templates/client_stub_slow.yml b/deploy/templates/client_stub_slow.yml
diff --git a/deploy/templates/system_stub.yml b/deploy/templates/system_stub.yml
diff --git a/examples/change_world_size_gcp.py b/examples/change_world_size_gcp.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		This chart was created by Kompose
		# FLTK Helm charts