From 304863dd53823280ad49448876c1e451196d7de1 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Fri, 20 Dec 2024 14:33:13 -0800
Subject: [PATCH] fix: configure workload pvc name and remove kueue annotations

---
 helm/applications/skaha/Chart.yaml                           | 2 +-
 helm/applications/skaha/skaha-config/launch-carta.yaml       | 2 +-
 helm/applications/skaha/skaha-config/launch-contributed.yaml | 2 +-
 helm/applications/skaha/skaha-config/launch-desktop-app.yaml | 2 +-
 helm/applications/skaha/skaha-config/launch-desktop.yaml     | 2 +-
 helm/applications/skaha/skaha-config/launch-headless.yaml    | 2 +-
 helm/applications/skaha/skaha-config/launch-notebook.yaml    | 1 -
 helm/applications/skaha/templates/session-volumes.yaml       | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/helm/applications/skaha/Chart.yaml b/helm/applications/skaha/Chart.yaml
index ef1fdfa..9608900 100644
--- a/helm/applications/skaha/Chart.yaml
+++ b/helm/applications/skaha/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.9.2
+version: 0.9.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/applications/skaha/skaha-config/launch-carta.yaml b/helm/applications/skaha/skaha-config/launch-carta.yaml
index ff20e72..691e8d6 100644
--- a/helm/applications/skaha/skaha-config/launch-carta.yaml
+++ b/helm/applications/skaha/skaha-config/launch-carta.yaml
@@ -7,7 +7,7 @@ metadata:
     canfar-net-sessionName: "${skaha.sessionname}"
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-interactive
+    
   name: "${skaha.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/skaha-config/launch-contributed.yaml b/helm/applications/skaha/skaha-config/launch-contributed.yaml
index 498dfa2..d8fcfb8 100644
--- a/helm/applications/skaha/skaha-config/launch-contributed.yaml
+++ b/helm/applications/skaha/skaha-config/launch-contributed.yaml
@@ -7,7 +7,7 @@ metadata:
     canfar-net-sessionName: "${skaha.sessionname}"
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-interactive
+    
   name: "${skaha.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/skaha-config/launch-desktop-app.yaml b/helm/applications/skaha/skaha-config/launch-desktop-app.yaml
index 01fa72a..e5f51e1 100644
--- a/helm/applications/skaha/skaha-config/launch-desktop-app.yaml
+++ b/helm/applications/skaha/skaha-config/launch-desktop-app.yaml
@@ -7,7 +7,7 @@ metadata:
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-appID: "${software.appid}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-interactive
+    
   name: "${software.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/skaha-config/launch-desktop.yaml b/helm/applications/skaha/skaha-config/launch-desktop.yaml
index 7fa1af7..8d1e4a8 100644
--- a/helm/applications/skaha/skaha-config/launch-desktop.yaml
+++ b/helm/applications/skaha/skaha-config/launch-desktop.yaml
@@ -7,7 +7,7 @@ metadata:
     canfar-net-sessionName: "${skaha.sessionname}"
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-interactive
+    
   name: "${skaha.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/skaha-config/launch-headless.yaml b/helm/applications/skaha/skaha-config/launch-headless.yaml
index 872f0fb..b3a4c68 100644
--- a/helm/applications/skaha/skaha-config/launch-headless.yaml
+++ b/helm/applications/skaha/skaha-config/launch-headless.yaml
@@ -7,7 +7,7 @@ metadata:
     canfar-net-sessionName: "${skaha.sessionname}"
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-headless
+    
   name: "${skaha.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/skaha-config/launch-notebook.yaml b/helm/applications/skaha/skaha-config/launch-notebook.yaml
index 5c7f143..ec3da60 100644
--- a/helm/applications/skaha/skaha-config/launch-notebook.yaml
+++ b/helm/applications/skaha/skaha-config/launch-notebook.yaml
@@ -7,7 +7,6 @@ metadata:
     canfar-net-sessionName: "${skaha.sessionname}"
     canfar-net-sessionType: "${skaha.sessiontype}"
     canfar-net-userid: "${skaha.userid}"
-    kueue.x-k8s.io/queue-name: skaha-workload-queue-interactive
   name: "${skaha.jobname}"
 spec:
   parallelism: 1
diff --git a/helm/applications/skaha/templates/session-volumes.yaml b/helm/applications/skaha/templates/session-volumes.yaml
index b40f570..6ee00f2 100644
--- a/helm/applications/skaha/templates/session-volumes.yaml
+++ b/helm/applications/skaha/templates/session-volumes.yaml
@@ -32,7 +32,7 @@ TODO: jenkinsd 2024.09.20
       {{- end }}
       - name: cavern-volume
         persistentVolumeClaim:
-          claimName: skaha-workload-cavern-pvc
+          claimName: {{ .Values.deployment.skaha.sessions.persistentVolumeClaimName | default "skaha-workload-cavern-pvc" }}
       - name: scratch-dir
         emptyDir: {}
 {{- end }}