Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
386 changes: 260 additions & 126 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ sqlx = { version = "0.9", default-features = false, features = ["runtime-tokio",
sqlx-core = { version = "0.9", default-features = false, features = ["rustls-native-certs"] }

# Kubernetes
kube = { version = "0.99", default-features = false, features = ["client", "runtime", "derive", "rustls-tls"] }
kube-runtime = "0.99"
k8s-openapi = { version = "0.24", features = ["v1_29"] }
kube = { version = "=5.0.0", default-features = false, features = ["client", "runtime", "derive", "rustls-tls"] }
kube-runtime = "=5.0.0"
k8s-openapi = { version = "0.29", features = ["v1_33"] }

# IDs
uuid = { version = "1.10", features = ["v4"] }
Expand Down
69 changes: 30 additions & 39 deletions crates/openshell-driver-kubernetes/src/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4777,7 +4777,8 @@ impl KubernetesComputeDriver {
generation_secrets.splice(0..0, [names.sandbox_secret, names.supervisor_secret]);
for name in &generation_secrets {
match secrets.delete(name, &DeleteParams::default()).await {
Ok(_) | Err(KubeError::Api(kube::core::ErrorResponse { code: 404, .. })) => {}
Ok(_) => {}
Err(KubeError::Api(error)) if error.code == 404 => {}
Err(error) => return Err(KubernetesDriverError::from_kube(error)),
}
}
Expand Down Expand Up @@ -4914,10 +4915,7 @@ impl KubernetesComputeDriver {
if !matches!(
tokio::time::timeout(KUBE_API_TIMEOUT, delete_api.api.get(&kube_name))
.await,
Ok(Err(KubeError::Api(kube::core::ErrorResponse {
code: 404,
..
})))
Ok(Err(KubeError::Api(error))) if error.code == 404
) {
warn!(sandbox_id, "Sandbox CR deletion was not confirmed");
return Ok(true);
Expand Down Expand Up @@ -6370,13 +6368,13 @@ fn managed_ssh_network_policy(namespace: &str, config: &KubernetesComputeConfig)
..Default::default()
},
spec: Some(NetworkPolicySpec {
pod_selector: LabelSelector {
pod_selector: Some(LabelSelector {
match_labels: Some(BTreeMap::from([(
LABEL_MANAGED_BY.to_string(),
LABEL_MANAGED_BY_VALUE.to_string(),
)])),
..Default::default()
},
}),
policy_types: Some(vec!["Ingress".to_string()]),
ingress: Some(vec![NetworkPolicyIngressRule {
from: Some(vec![NetworkPolicyPeer {
Expand Down Expand Up @@ -7303,7 +7301,7 @@ fn map_kube_event_to_platform(
.last_timestamp
.as_ref()
.or(obj.first_timestamp.as_ref())
.map_or(0, |t| t.0.timestamp_millis());
.map_or(0, |t| t.0.as_millisecond());

let mut metadata = std::collections::HashMap::new();
metadata.insert("involved_kind".to_string(), involved_kind);
Expand Down Expand Up @@ -9965,51 +9963,43 @@ mod tests {
}

fn kube_api_error(code: u16, message: &str) -> KubeError {
KubeError::Api(kube::core::ErrorResponse {
status: if code == 404 {
"404 Not Found".to_string()
} else {
"Failure".to_string()
},
message: message.to_string(),
reason: "Failed to parse error data".to_string(),
code,
})
KubeError::Api(
kube::core::Status::failure(message, "Failed to parse error data")
.with_code(code)
.boxed(),
)
}

#[test]
fn resource_version_conflicts_are_not_reported_as_duplicate_sandboxes() {
let conflict = KubeError::Api(kube::core::ErrorResponse {
status: "Failure".to_string(),
message: "the object has been modified".to_string(),
reason: "Conflict".to_string(),
code: 409,
});
let conflict = KubeError::Api(
kube::core::Status::failure("the object has been modified", "Conflict")
.with_code(409)
.boxed(),
);
assert!(is_kube_resource_version_conflict(&conflict));
assert!(matches!(
KubernetesDriverError::from_kube(conflict),
KubernetesDriverError::Message(_)
));

let duplicate = KubeError::Api(kube::core::ErrorResponse {
status: "Failure".to_string(),
message: "already exists".to_string(),
reason: "AlreadyExists".to_string(),
code: 409,
});
let duplicate = KubeError::Api(
kube::core::Status::failure("already exists", "AlreadyExists")
.with_code(409)
.boxed(),
);
assert!(matches!(
KubernetesDriverError::from_kube(duplicate),
KubernetesDriverError::AlreadyExists
));
}

fn expired_watch_error() -> watcher::Error {
watcher::Error::WatchError(kube::core::ErrorResponse {
status: "Failure".to_string(),
message: "too old resource version".to_string(),
reason: "Expired".to_string(),
code: 410,
})
watcher::Error::WatchError(
kube::core::Status::failure("too old resource version", "Expired")
.with_code(410)
.boxed(),
)
}

#[tokio::test]
Expand Down Expand Up @@ -14429,9 +14419,10 @@ mod tests {
}

let mut deleting = reconnecting;
deleting.metadata.deletion_timestamp = Some(
k8s_openapi::apimachinery::pkg::apis::meta::v1::Time(k8s_openapi::chrono::Utc::now()),
);
deleting.metadata.deletion_timestamp =
Some(k8s_openapi::apimachinery::pkg::apis::meta::v1::Time(
k8s_openapi::jiff::Timestamp::now(),
));
assert_eq!(
sandbox_runtime_control_availability_from_pod(&deleting),
SandboxRuntimeControlAvailability::Unavailable
Expand Down
20 changes: 10 additions & 10 deletions crates/openshell-driver-kubernetes/src/isolation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ impl KubernetesSandboxRuntimeNetworkFenceSpec {
..Default::default()
},
spec: Some(NetworkPolicySpec {
pod_selector: LabelSelector {
pod_selector: Some(LabelSelector {
match_labels: Some(workload_labels.clone()),
..Default::default()
},
}),
policy_types: Some(vec!["Ingress".to_string(), "Egress".to_string()]),
// Any trusted OpenShell supervisor in this namespace may
// reach a sandbox listener. The Sandbox Protocol enforces the
Expand Down Expand Up @@ -189,10 +189,10 @@ impl KubernetesSandboxRuntimeNetworkFenceSpec {
..Default::default()
},
spec: Some(NetworkPolicySpec {
pod_selector: LabelSelector {
pod_selector: Some(LabelSelector {
match_labels: Some(control_labels.clone()),
..Default::default()
},
}),
policy_types: Some(vec!["Egress".to_string()]),
egress: Some(vec![NetworkPolicyEgressRule::default()]),
..Default::default()
Expand Down Expand Up @@ -265,13 +265,13 @@ pub fn runtime_control_policy(namespace: &str, name: &str, pair: &str, port: u16
..Default::default()
},
spec: Some(NetworkPolicySpec {
pod_selector: LabelSelector {
pod_selector: Some(LabelSelector {
match_labels: Some(BTreeMap::from([(
BOUNDARY_PAIR_LABEL.to_string(),
pair.to_string(),
)])),
..Default::default()
},
}),
policy_types: Some(vec!["Ingress".to_string(), "Egress".to_string()]),
ingress: Some(vec![NetworkPolicyIngressRule {
from: pair_role(WORKLOAD_ROLE),
Expand Down Expand Up @@ -308,10 +308,10 @@ pub fn shared_runtime_control_policy(
..Default::default()
},
spec: Some(NetworkPolicySpec {
pod_selector: LabelSelector {
pod_selector: Some(LabelSelector {
match_labels: Some(pair_role_labels(pair, WORKLOAD_ROLE)),
..Default::default()
},
}),
policy_types: Some(vec!["Egress".to_string()]),
egress: Some(vec![NetworkPolicyEgressRule {
to: Some(vec![NetworkPolicyPeer {
Expand Down Expand Up @@ -755,7 +755,7 @@ mod tests {
);
assert_eq!(policy_spec.egress, Some(Vec::new()));
assert_eq!(
policy_spec.pod_selector.match_labels,
policy_spec.pod_selector.unwrap().match_labels,
Some(fence.workload_labels)
);
}
Expand Down Expand Up @@ -814,7 +814,7 @@ mod tests {
.expect("supervisor policy has a spec");
assert_eq!(policy_spec.policy_types, Some(vec!["Egress".to_string()]));
assert_eq!(
policy_spec.pod_selector.match_labels,
policy_spec.pod_selector.unwrap().match_labels,
Some(fence.control_labels)
);
assert_eq!(
Expand Down
2 changes: 1 addition & 1 deletion docs/about/support-matrix.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Install the software for the compute driver you use:
|---|---|---|
| Docker Desktop or Docker Engine | 28.0 | Required for Docker-backed gateways, local image builds, and Docker development workflows. |
| Podman | 5.x | Required for Podman-backed gateways. |
| Kubernetes | 1.29 | Required for Helm deployments and Kubernetes sandbox scheduling. |
| Kubernetes | 1.33 (tested) | Older cluster versions are untested; compatibility is not guaranteed. |
| Helm | 3.x | Required to install `deploy/helm/openshell`. |
| kubectl | Compatible with your cluster | Required for Kubernetes operational inspection and secret creation. |
| Host virtualization | Host dependent | Required for MicroVM-backed gateways. MicroVM uses Hypervisor.framework on macOS and KVM on Linux. |
Expand Down
2 changes: 1 addition & 1 deletion docs/kubernetes/setup.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Make sure the following are in place before you install.

| Prerequisite | Required | Notes |
|---|---|---|
| Kubernetes 1.29+ with RBAC enabled | Yes | No additional notes. |
| Kubernetes cluster with RBAC enabled | Yes | Minimum tested version is 1.33. Older cluster versions are untested. |
| CNI that enforces ingress and egress `NetworkPolicy` in sandbox namespaces | Yes | Verify enforcement on your cluster. |
| Helm 3.x | Yes | No additional notes. |
| Agent Sandbox controller and CRDs | Yes | Install before the OpenShell chart. Refer to [Install Agent Sandbox](#install-agent-sandbox). |
Expand Down
Loading
Loading