chore: pull json_patch_ext into its own crate

Cargo.toml

@@ -39,7 +39,9 @@ derive_setters = "0.1.6"
 dirs = "5.0.1"
 either = "1.12.0"
 futures = "0.3.28"
-json-patch = "1.2.0"
+# remove this when we bump kube-rs
+json-patch = { version = "1.0.0" }
+json-patch-ext = "0.1.0"
 k8s-openapi = { version = "0.19.0", features = ["v1_27"] }
 lazy_static = "1.5.0"
 object_store = { version = "0.11.0", features = ["aws", "gcp", "azure", "http"] }

sk-cli/Cargo.toml

@@ -19,7 +19,7 @@ clap = { workspace = true }
 clap_complete = { workspace = true }
 derive_setters = { workspace = true }
 dirs = { workspace = true }
-json-patch = { workspace = true }
+json-patch-ext = { workspace = true }
 kube = { workspace = true }
 k8s-openapi = { workspace = true }
 lazy_static = { workspace = true }

sk-core/Cargo.toml

@@ -17,7 +17,6 @@ async-recursion = { workspace = true }
 async-trait = { workspace = true }
 bytes = { workspace = true }
 clockabilly = { workspace = true }
-json-patch = { workspace = true }
 kube = { workspace = true }
 k8s-openapi = { workspace = true }
 object_store = { workspace = true }

sk-core/src/k8s/pod_lifecycle.rs

@@ -6,15 +6,9 @@ use std::cmp::{
 };
 
 use clockabilly::Clockable;
-use json_patch::{
-    AddOperation,
-    PatchOperation,
-};
 use kube::ResourceExt;
-use serde_json::Value;
 
 use super::*;
-use crate::jsonutils;
 use crate::prelude::*;
 
 // A PodLifecycleData object is how we track the length of time a pod was running in a cluster.  It
@@ -147,16 +141,6 @@ impl PodLifecycleData {
     pub fn finished(&self) -> bool {
         matches!(self, PodLifecycleData::Finished(..))
     }
-
-    pub fn to_annotation_patch(&self) -> Option<PatchOperation> {
-        match self {
-            PodLifecycleData::Empty | PodLifecycleData::Running(_) => None,
-            PodLifecycleData::Finished(start_ts, end_ts) => Some(PatchOperation::Add(AddOperation {
-                path: format!("/metadata/annotations/{}", jsonutils::escape(LIFETIME_ANNOTATION_KEY)),
-                value: Value::String(format!("{}", end_ts - start_ts)),
-            })),
-        }
-    }
 }
 
 // We implement PartialOrd and PartialEq for PodLifecycleData; this is maybe a little bit magic,

sk-driver/Cargo.toml

@@ -19,6 +19,7 @@ either = { workspace = true }
 kube = { workspace = true }
 k8s-openapi = { workspace = true }
 json-patch = { workspace = true }
+json-patch-ext = { workspace = true }
 rocket = { workspace = true }
 serde_json = { workspace = true }
 sk-api = { workspace = true }

sk-driver/src/mutation.rs

@@ -6,6 +6,7 @@ use json_patch::{
     Patch,
     PatchOperation,
 };
+use json_patch_ext::escape;
 use kube::core::admission::{
     AdmissionRequest,
     AdmissionResponse,
@@ -21,6 +22,7 @@ use sk_core::jsonutils;
 use sk_core::k8s::{
     KubeResourceExt,
     PodExt,
+    PodLifecycleData,
 };
 use sk_core::prelude::*;
 
@@ -101,7 +103,7 @@ fn add_simulation_labels(ctx: &DriverContext, pod: &corev1::Pod, patches: &mut V
         patches.push(PatchOperation::Add(AddOperation { path: "/metadata/labels".into(), value: json!({}) }));
     }
     patches.push(PatchOperation::Add(AddOperation {
-        path: format!("/metadata/labels/{}", jsonutils::escape(SIMULATION_LABEL_KEY)),
+        path: format!("/metadata/labels/{}", escape(SIMULATION_LABEL_KEY)),
         value: Value::String(ctx.name.clone()),
     }));
 
@@ -126,7 +128,7 @@ fn add_lifecycle_annotation(
             let seq = mut_data.count(hash);
 
             let lifecycle = ctx.store.lookup_pod_lifecycle(&owner_ns_name, hash, seq);
-            if let Some(patch) = lifecycle.to_annotation_patch() {
+            if let Some(patch) = to_annotation_patch(&lifecycle) {
                 info!("applying lifecycle annotations (hash={hash}, seq={seq})");
                 if pod.metadata.annotations.is_none() {
                     patches.push(PatchOperation::Add(AddOperation {
@@ -170,3 +172,13 @@ fn into_pod_review(resp: AdmissionResponse) -> AdmissionReview<corev1::Pod> {
         response: Some(resp),
     }
 }
+
+fn to_annotation_patch(pld: &PodLifecycleData) -> Option<PatchOperation> {
+    match pld {
+        PodLifecycleData::Empty | PodLifecycleData::Running(_) => None,
+        PodLifecycleData::Finished(start_ts, end_ts) => Some(PatchOperation::Add(AddOperation {
+            path: format!("/metadata/annotations/{}", escape(LIFETIME_ANNOTATION_KEY)),
+            value: Value::String(format!("{}", end_ts - start_ts)),
+        })),
+    }
+}