fix(vine): skip updating immutable resources

ulagbulag · Dec 16, 2024 · 2eee36f · 2eee36f
1 parent c617060
commit 2eee36f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/crates/dash/provider/src/client/job.rs b/crates/dash/provider/src/client/job.rs
@@ -271,13 +271,20 @@ impl TaskActorJobClient {
                 ),
             };
 
+            // Detect the immutable resources
+            let immutable = matches!(
+                (ar.group.as_str(), ar.kind.as_str()),
+                ("", "PersistentVolume") | ("storage.k8s.io", "StorageClass")
+            );
+
             // Use the discovered kind in an Api, and Controller with the ApiResource as its DynamicType
             let api: Api<DynamicObject> = match caps.scope {
                 Scope::Cluster => Api::all_with(self.kube.clone(), &ar),
                 Scope::Namespaced => Api::namespaced_with(self.kube.clone(), namespace, &ar),
             };
             apis.push(Template {
                 api,
+                immutable,
                 name: name.clone(),
                 template,
             });
@@ -289,6 +296,7 @@ impl TaskActorJobClient {
 #[derive(Debug)]
 struct Template {
     api: Api<DynamicObject>,
+    immutable: bool,
     name: String,
     template: DynamicObject,
 }
@@ -304,6 +312,11 @@ impl From<&Template> for TemplateRef {
 #[instrument(level = Level::INFO, skip(template), fields(template.name = %template.name), err(Display))]
 async fn try_create(template: Template, exists: bool) -> Result<()> {
     if exists {
+        // Skip applying to immutable resources
+        if template.immutable {
+            return Ok(());
+        }
+
         let pp = PatchParams {
             field_manager: Some(crate::NAME.into()),
             force: true,

diff --git a/templates/vine/templates/session/user-session.yaml.j2 b/templates/vine/templates/session/user-session.yaml.j2
@@ -719,6 +719,7 @@ spec:
   capacity: {{ spec.boxQuota.storage.requests | json_encode() | safe }}
   hostPath:
     path: "/opt/vine/sessions/{{ metadata.namespace }}"
+    type: DirectoryOrCreate
   persistentVolumeReclaimPolicy: Recycle
   storageClassName: manual
 ---
@@ -757,6 +758,7 @@ spec:
   capacity: {{ spec.boxQuota.storage.requests | json_encode() | safe }}
   hostPath:
     path: "/opt/vine/sessions/_shared"
+    type: DirectoryOrCreate
   persistentVolumeReclaimPolicy: Retain
   storageClassName: manual
 ---