From 676a00e2e1d18cc0548443a3124af482669c14b7 Mon Sep 17 00:00:00 2001
From: Austin Macdonald <austin@dartmouth.edu>
Date: Mon, 11 Nov 2024 08:54:57 -0600
Subject: [PATCH] pod back to job

---
 .github/manifests/disk-usage-report-job.yaml | 54 +++++++++++---------
 .github/workflows/report.yaml                |  9 ++--
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/.github/manifests/disk-usage-report-job.yaml b/.github/manifests/disk-usage-report-job.yaml
index 81ff08d..387aead 100644
--- a/.github/manifests/disk-usage-report-job.yaml
+++ b/.github/manifests/disk-usage-report-job.yaml
@@ -1,30 +1,34 @@
-apiVersion: v1
-kind: Pod
+apiVersion: v1/batch
+kind: Job
 metadata:
   name: disk-usage-report-job
   namespace: jupyterhub
 spec:
-  containers:
-    - name: disk-usage-report
-      image: IMAGE_PLACEHOLDER
-      args:
-        - "/home/asmacdo"
-      volumeMounts:
+  template:
+    metadata:
+      labels:
+        app: disk-usage-report
+    spec:
+      containers:
+        - name: disk-usage-report
+          image: IMAGE_PLACEHOLDER
+          args:
+            - "/home/asmacdo"
+          volumeMounts:
+            - name: persistent-storage
+              mountPath: "/home"
+              subPath: "home"
+      restartPolicy: Never
+      nodeSelector:
+        NodeGroupType: default
+        NodePool: default
+        hub.jupyter.org/node-purpose: user
+      tolerations:
+        - key: "hub.jupyter.org/dedicated"
+          operator: "Equal"
+          value: "user"
+          effect: "NoSchedule"
+      volumes:
         - name: persistent-storage
-          mountPath: "/home"
-          subPath: "home"
-  restartPolicy: Never
-  nodeSelector:
-    NodeGroupType: default
-    NodePool: default
-    hub.jupyter.org/node-purpose: user
-  tolerations:
-    - key: "hub.jupyter.org/dedicated"
-      operator: "Equal"
-      value: "user"
-      effect: "NoSchedule"
-  volumes:
-    - name: persistent-storage
-      persistentVolumeClaim:
-        claimName: efs-persist
-
+          persistentVolumeClaim:
+            claimName: efs-persist
diff --git a/.github/workflows/report.yaml b/.github/workflows/report.yaml
index 34241ee..1c2692a 100644
--- a/.github/workflows/report.yaml
+++ b/.github/workflows/report.yaml
@@ -73,26 +73,27 @@ jobs:
         run: |
           sed -i 's|IMAGE_PLACEHOLDER|'"${{ secrets.DOCKERHUB_USERNAME }}/dandihub-report-generator:latest"'|' .github/manifests/disk-usage-report-job.yaml
 
-      - name: Deploy Disk Usage Report Job Pod
+      - name: Deploy Disk Usage Report Job
         run: |
           kubectl apply -f .github/manifests/disk-usage-report-job.yaml
 
       # TODO should timeout be longer?
       - name: Wait for Disk Usage Report Job to complete
         run: |
-          kubectl wait --for=condition=complete pod/disk-usage-report-job --timeout=360s -n jupyterhub
+          kubectl wait --for=condition=complete job/disk-usage-report-job --timeout=360s -n jupyterhub
         continue-on-error: true
 
       - name: Retrieve generated report file
         run: |
-          kubectl cp disk-usage-report-job:/output/du_report.json du_report.json -n jupyterhub
+          POD_NAME=$(kubectl get pods --selector=job-name=disk-usage-report-job -o jsonpath='{.items[0].metadata.name}')
+          kubectl cp $POD_NAME:/output/du_report.json du_report.json -n jupyterhub
           cat du_report.json
         continue-on-error: true
 
       # continue-on-error for previous steps so we delete the job
       - name: Delete Disk Usage Report Job
         run: |
-          kubectl delete pod disk-usage-report-job -n jupyterhub
+          kubectl delete job disk-usage-report-job -n jupyterhub
 
       # - name: Clone dandi-hub-usage-reports repository
       #   run: |