Fix citation typo and level-sites had unnecessary env variables. Also…

…, I am going to poke around eksctl to dcreate one pod per ec2 instance
adwise-fiu · Jun 22, 2023 · 184d4d6 · 184d4d6
1 parent 3e8165b
commit 184d4d6
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 260 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -9,7 +9,7 @@ authors:
 - family-names: "Gallagher"
  given-names: "Kevin"
 - family-names: "Samaras"
- given-names: "Nikolaous"
+ given-names: "Nikolaos"
 title: "Privacy Preserving Decision Trees in a Multi-Party Setting: a Level-Based Approach"
 version: 2.0.0
 doi: TBD
@@ -26,7 +26,7 @@ preferred-citation:
  - family-names: "Gallagher"
  given-names: "Kevin"
  - family-names: "Samaras"
- given-names: "Nikolaous"
+ given-names: "Nikolaos"
  journal: "ACM CCS '23 Computer and Communications Security"
  month: 07
  start: 1 # First page number

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Andrew Quijano
+Copyright (c) 2022 - 2023 Andrew Quijano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/eks-config/config.yaml b/eks-config/config.yaml
@@ -5,10 +5,29 @@ metadata:
  name: ppdt
  region: us-east-2
  version: "1.27"
+
+# Managed Node Groups show up on AWS console
 managedNodeGroups:
-- name: primary
- instanceType: m5.large
- desiredCapacity: 12
- minSize: 12
+- name: level-sites
+ instanceType: t2.large
+ labels: { role: level-site }
+ minSize: 10
  maxSize: 15
- spot: true
+ desiredCapacity: 10
+ maxPodsPerNode: 1
+
+- name: client
+ instanceType: t2.large
+ labels: { role: client }
+ minSize: 1
+ maxSize: 1
+ desiredCapacity: 1
+ maxPodsPerNode: 1
+
+- name: server
+ instanceType: t2.large
+ labels: { role: server-site }
+ minSize: 1
+ maxSize: 1
+ desiredCapacity: 1
+ maxPodsPerNode: 1
diff --git a/eks-config/k8/level_sites/level_site_01_deployment.yaml b/eks-config/k8/level_sites/level_site_01_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/eks-config/k8/level_sites/level_site_02_deployment.yaml b/eks-config/k8/level_sites/level_site_02_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/eks-config/k8/level_sites/level_site_03_deployment.yaml b/eks-config/k8/level_sites/level_site_03_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/eks-config/k8/level_sites/level_site_04_deployment.yaml b/eks-config/k8/level_sites/level_site_04_deployment.yaml
@@ -22,23 +22,11 @@ spec:
  - containerPort: 9000
  env:
  - name: TREE_ROLE
- value: "LEVEL_SITE"
-
- - name: PPDT_DATA_DIR
- value: "/data/"
+ value: "LEVEL_SITE" 
 
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/eks-config/k8/level_sites/level_site_05_deployment.yaml b/eks-config/k8/level_sites/level_site_05_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/eks-config/k8/level_sites/level_site_06_deployment.yaml b/eks-config/k8/level_sites/level_site_06_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/eks-config/k8/level_sites/level_site_07_deployment.yaml b/eks-config/k8/level_sites/level_site_07_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/eks-config/k8/level_sites/level_site_08_deployment.yaml b/eks-config/k8/level_sites/level_site_08_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/eks-config/k8/level_sites/level_site_09_deployment.yaml b/eks-config/k8/level_sites/level_site_09_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/eks-config/k8/level_sites/level_site_10_deployment.yaml b/eks-config/k8/level_sites/level_site_10_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/k8/level_sites/level_site_01_deployment.yaml b/k8/level_sites/level_site_01_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:

diff --git a/k8/level_sites/level_site_02_deployment.yaml b/k8/level_sites/level_site_02_deployment.yaml
@@ -24,23 +24,11 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef:
  name: ppdt-secrets
- key: aes-key
+ key: aes-key
diff --git a/k8/level_sites/level_site_03_deployment.yaml b/k8/level_sites/level_site_03_deployment.yaml
@@ -24,21 +24,9 @@ spec:
  - name: TREE_ROLE
  value: "LEVEL_SITE" 
 
- - name: PPDT_DATA_DIR
- value: "/data/"
-
  - name: PORT_NUM
  value: "9000"
 
- - name: PRECISION
- value: "2"
-
- - name: LEVEL_SITE_DOMAINS
- value: "ppdt-level-site-01-service,ppdt-level-site-02-service,ppdt-level-site-03-service,ppdt-level-site-04-service,ppdt-level-site-05-service,ppdt-level-site-06-service,ppdt-level-site-07-service,ppdt-level-site-08-service,ppdt-level-site-09-service,ppdt-level-site-10-service"
-
- - name: TIME_METHODS
- value: "true"
-
  - name: AES_PASS
  valueFrom:
  secretKeyRef: