Single server

.github/workflows/build-gradle-project.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ALIAS: andrew
-      KEYSTORE: andrew_keystore
+      KEYSTORE: keystore
       PASSWORD: ${{ secrets.PASSWORD }}
 
     steps:

.github/workflows/build-push-action.yml

@@ -18,6 +18,11 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      ALIAS: andrew
+      KEYSTORE: andrew_keystore
+      PASSWORD: ${{ secrets.PASSWORD }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -27,7 +32,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+
+      - name: Create Key Store
+        run: sh create_keystore.sh
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 

.gitignore

@@ -7,6 +7,9 @@ bin
 
 # No attaching Kubernetes secrets
 k8/level_sites/ppdt-secrets.yaml
+k8/client/ppdt-secrets.yaml
+k8/server/ppdt-secrets.yaml
+k8/server-job/ppdt-secrets.yaml
 
 # Outputs from PPDT creation
 output

README.md

@@ -34,8 +34,8 @@ bash setup.sh
 
 1. Check the `config.properties` file is set to your needs. Currently:
    1. It assumes level-site 0 would use port 9000, level-site 1 would use port 9001, etc.
-      1. If you modify this, provide a comma separated string of all the ports for each level-site.
-      2. Currently, it assumes ports 9000 - 9009 will be used.
+      1. If you modify this, provide a comma-separated string of all the ports for each level-site.
+      2. Currently, it assumes ports 9000–9009 will be used.
    2. key_size corresponds to the key size of both DGK and Paillier keys.
    3. precision controls how accurate to measure thresholds that are decimals. If a value was 100.1, then a precision of
       1 would set this value to 1001.
@@ -66,7 +66,7 @@ This would assume one execution rather than multiple executions.
 In the `server_site_training_job.yaml` file, you need to change the first argument to point to the right ARFF file.
 
 #### Creating a Kubernetes Secret
-You should set up a Kubernetes secret file, called `ppdt-secrets.yaml` in the `k8/level-sites` folder.
+You should set up a Kubernetes secret file, called `ppdt-secrets.yaml` in the `k8/level-sites`, `k8/client`, and `k8/server` folder.
 In the yaml file, you will need to replace <SECRET_VALUE> with a random string encoded in Base64.
 This secret is used in the AES encryption between level sites.
 ```yaml
@@ -76,7 +76,7 @@ metadata:
     name: ppdt-secrets
 type: Opaque
 data:
-  aes-key: <SECRET_VALUE>>
+  keystore-pass: <SECRET_VALUE>>
 ```
 
 or you can use the command:
@@ -144,7 +144,7 @@ To get the results, access the logs as described in the previous steps for both
 
 #### Re-running with different experiments
 - *Case 1: Re-run with different testing set*  
-As the job created the pod, you would connect to the pod and run the modified gradle command with the other VALUES file.
+As the job created the pod, you would connect to the pod and run the modified Gradle command with the other VALUES file.
 ```bash
 kubectl exec -i -t $(kubectl get pod -l "pod=ppdt-client-deploy" -o name) -- bash -c "gradle run -PchooseRole=weka.finito.client --args <VALUES-FILE>"
 ```

k8/client/client_deployment.yaml

@@ -41,3 +41,12 @@ spec:
 
             - name: GRADLE_USER_HOME
               value: "gradle_user_home"
+
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_01_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_02_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_03_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_04_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_05_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_06_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_07_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_08_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_09_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/level_sites/level_site_10_deployment.yaml

@@ -27,8 +27,11 @@ spec:
             - name: PORT_NUM
               value: "9000"
 
-            - name: AES_PASS
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
               valueFrom:
                 secretKeyRef:
-                    name: ppdt-secrets
-                    key: aes-key
+                  name: ppdt-secrets
+                  key: keystore-pass

k8/server-job/server_training_job.yaml

@@ -29,4 +29,13 @@ spec:
           - name: GRADLE_USER_HOME
             value: "gradle_user_home"
 
+          - name: KEYSTORE
+            value: "keystore"
+
+          - name: PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: ppdt-secrets
+                key: keystore-pass
+
   backoffLimit: 4

k8/server-deploy/server_deployment.yaml → k8/server/server_deployment.yaml

@@ -38,3 +38,12 @@ spec:
 
             - name: GRADLE_USER_HOME
               value: "gradle_user_home"
+
+            - name: KEYSTORE
+              value: "keystore"
+
+            - name: PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: ppdt-secrets
+                  key: keystore-pass