From da913d65e40580874c836f07c44dd74fa396edec Mon Sep 17 00:00:00 2001
From: Jeroen Galjaard <J.M.Galjaard-1@student.tudelft.nl>
Date: Tue, 19 Apr 2022 14:51:12 +0200
Subject: [PATCH] Minor revision of deployment charts

---
 charts/README.md                                         | 2 +-
 charts/extractor/templates/NOTES.txt                     | 2 +-
 charts/extractor/values.yaml                             | 2 +-
 charts/orchestrator/templates/fl-server-clusterrole.yaml | 3 ++-
 charts/orchestrator/templates/fl-server-pod.yaml         | 3 ++-
 charts/orchestrator/values.yaml                          | 7 ++++---
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/charts/README.md b/charts/README.md
index f69ad4b4..2d87b332 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -1,3 +1,3 @@
 # FLTK Helm charts
 
-This directory contains the charts required to launch 
\ No newline at end of file
+This directory contains the charts required to launch.
\ No newline at end of file
diff --git a/charts/extractor/templates/NOTES.txt b/charts/extractor/templates/NOTES.txt
index 55f6b4d8..6b4c766e 100644
--- a/charts/extractor/templates/NOTES.txt
+++ b/charts/extractor/templates/NOTES.txt
@@ -1,5 +1,5 @@
 Get the FLTK extractors Tensorboard URL by running:
 
 export POD_NAME=$(kubectl get pods -n {{ .Release.Namespace }} -l "app.kubernetes.io/name=fltk.extractor" -o jsonpath="{.items[0].metadata.name}")
-echo http://127.0.0.1:8443/
+echo http://localhost:6006/
 kubectl -n {{ .Release.Namespace }} port-forward $POD_NAME 6006:6006
diff --git a/charts/extractor/values.yaml b/charts/extractor/values.yaml
index a1c8c10e..83459468 100644
--- a/charts/extractor/values.yaml
+++ b/charts/extractor/values.yaml
@@ -1,5 +1,5 @@
 extractor:
   logging:
-    size: 2Gi
+    size: 2Gi # Set to larger size for
   output:
     size: 5Gi
\ No newline at end of file
diff --git a/charts/orchestrator/templates/fl-server-clusterrole.yaml b/charts/orchestrator/templates/fl-server-clusterrole.yaml
index 018441be..c5a27e19 100644
--- a/charts/orchestrator/templates/fl-server-clusterrole.yaml
+++ b/charts/orchestrator/templates/fl-server-clusterrole.yaml
@@ -2,7 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: fltk-administrator-role
-#  Currently, we allow every action with this ClusterRole, these could be restricted if deemed necessary
+# Currently, we allow every action with this ClusterRole, these could be restricted if deemed necessary.
+# This will result in potential security risks on a production cluster.
 rules:
   - apiGroups:
       - '*'
diff --git a/charts/orchestrator/templates/fl-server-pod.yaml b/charts/orchestrator/templates/fl-server-pod.yaml
index b0569d18..f7707390 100644
--- a/charts/orchestrator/templates/fl-server-pod.yaml
+++ b/charts/orchestrator/templates/fl-server-pod.yaml
@@ -15,7 +15,8 @@ spec:
         - fltk
       args:
         - cluster
-        - {{ .Values.orchestrator.experimentFile }}
+        - {{ .Values.orchestrator.runtime.configurationFile }}
+        - {{ .Values.orchestrator.runtime.experimentFile }}
       env:
         - name: PYTHONUNBUFFERED
           value: "1"
diff --git a/charts/orchestrator/values.yaml b/charts/orchestrator/values.yaml
index 3ffcf33e..47d773d3 100644
--- a/charts/orchestrator/values.yaml
+++ b/charts/orchestrator/values.yaml
@@ -1,5 +1,6 @@
 orchestrator:
-    cpu: 200m
+    cpu: 500m
     memory: 500Mi
-    configurationFile: configs/tasks/example_arrival_config.json
-    experimentFile: configs/tasks/example_arrival_config.json
\ No newline at end of file
+    runtime:
+      configurationFile: configs/example_arrival_config.json
+      experimentFile: configs/federated_tasks/example_arrival_config.json
\ No newline at end of file