Secure, Fast, and Extensible Sandbox runtime for AI agents.
fix(kubernetes): fail rootfs snapshots whose commit result lacks digests
JasonBuildAI162e44cf630d
diff --git a/kubernetes/internal/controller/sandboxsnapshot_controller_test.go b/kubernetes/internal/controller/sandboxsnapshot_controller_test.goindex 8308a1bcc..7738ce9ed 100644--- a/kubernetes/internal/controller/sandboxsnapshot_controller_test.go+++ b/kubernetes/internal/controller/sandboxsnapshot_controller_test.go@@ -168,6 +168,179 @@ func TestSandboxSnapshotHandleCommitting_PersistsImageDigestsFromTerminationMessassert.Equal(t, "sha256:sidecar", updated.Status.Containers[1].ImageDigest)}+func TestSandboxSnapshotHandleCommitting_RootfsCommitWithoutResultFails(t *testing.T) {+ snapshot := &sandboxv1alpha1.SandboxSnapshot{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot",+ Namespace: "default",+ },+ Status: sandboxv1alpha1.SandboxSnapshotStatus{+ Phase: sandboxv1alpha1.SandboxSnapshotPhaseCommitting,+ Format: sandboxv1alpha1.SandboxSnapshotFormatRootfsV1,+ Containers: []sandboxv1alpha1.ContainerSnapshot{+ {ContainerName: "main", ImageURI: "registry/test-main:tag"},+ },+ },+ }+ job := &batchv1.Job{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot-commit",+ Namespace: "default",+ },+ Status: batchv1.JobStatus{+ Succeeded: 1,+ },+ }++ r := newTestSnapshotReconciler(snapshot, job)++ result, err := r.handleCommitting(context.Background(), snapshot)+ require.NoError(t, err)+ assert.Equal(t, ctrl.Result{}, result)++ updated := &sandboxv1alpha1.SandboxSnapshot{}+ require.NoError(t, r.Get(context.Background(), types.NamespacedName{Name: "test-snapshot", Namespace: "default"}, updated))+ assert.Equal(t, sandboxv1alpha1.SandboxSnapshotPhaseFailed, updated.Status.Phase)++ failedCond := findSnapshotCondition(updated.Status.Conditions, sandboxv1alpha1.SandboxSnapshotConditionFailed)+ require.NotNil(t, failedCond)+ assert.Equal(t, sandboxv1alpha1.ConditionTrue, failedCond.Status)+ assert.Equal(t, "CommitResultUnavailable", failedCond.Reason)+ assert.Contains(t, failedCond.Message, "main")+}++func TestSandboxSnapshotHandleCommitting_RootfsCommitWithIncompleteResultFails(t *testing.T) {+ snapshot := &sandboxv1alpha1.SandboxSnapshot{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot",+ Namespace: "default",+ },+ Status: sandboxv1alpha1.SandboxSnapshotStatus{+ Phase: sandboxv1alpha1.SandboxSnapshotPhaseCommitting,+ Format: sandboxv1alpha1.SandboxSnapshotFormatRootfsV1,+ Containers: []sandboxv1alpha1.ContainerSnapshot{+ {ContainerName: "main", ImageURI: "registry/test-main:tag"},+ {ContainerName: "sidecar", ImageURI: "registry/test-sidecar:tag"},+ },+ },+ }+ job := &batchv1.Job{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot-commit",+ Namespace: "default",+ },+ Status: batchv1.JobStatus{+ Succeeded: 1,+ },+ }+ commitPod := &corev1.Pod{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot-commit-abcde",+ Namespace: "default",+ Labels: map[string]string{+ "job-name": "test-snapshot-commit",+ },+ },+ Status: corev1.PodStatus{+ ContainerStatuses: []corev1.ContainerStatus{+ {+ Name: commitJobContainerName,+ State: corev1.ContainerState{+ Terminated: &corev1.ContainerStateTerminated{+ ExitCode: 0,+ Message: `{"containers":[{"name":"main","image":"registry/test-main:tag","digest":"sha256:main"}]}`,+ },+ },+ },+ },+ },+ }++ r := newTestSnapshotReconciler(snapshot, job, commitPod)++ result, err := r.handleCommitting(context.Background(), snapshot)+ require.NoError(t, err)+ assert.Equal(t, ctrl.Result{}, result)++ updated := &sandboxv1alpha1.SandboxSnapshot{}+ require.NoError(t, r.Get(context.Background(), types.NamespacedName{Name: "test-snapshot", Namespace: "default"}, updated))+ assert.Equal(t, sandboxv1alpha1.SandboxSnapshotPhaseFailed, updated.Status.Phase)++ failedCond := findSnapshotCondition(updated.Status.Conditions, sandboxv1alpha1.SandboxSnapshotConditionFailed)+ require.NotNil(t, failedCond)+ assert.Equal(t, sandboxv1alpha1.ConditionTrue, failedCond.Status)+ assert.Equal(t, "CommitResultIncomplete", failedCond.Reason)+ assert.Contains(t, failedCond.Message, "sidecar")+}++func TestSandboxSnapshotHandleCommitting_RootfsCommitWithAllDigestsSucceeds(t *testing.T) {+ snapshot := &sandboxv1alpha1.SandboxSnapshot{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot",+ Namespace: "default",+ },+ Status: sandboxv1alpha1.SandboxSnapshotStatus{+ Phase: sandboxv1alpha1.SandboxSnapshotPhaseCommitting,+ Format: sandboxv1alpha1.SandboxSnapshotFormatRootfsV1,+ Containers: []sandboxv1alpha1.ContainerSnapshot{+ {ContainerName: "main", ImageURI: "registry/test-main:tag"},+ },+ },+ }+ job := &batchv1.Job{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot-commit",+ Namespace: "default",+ },+ Status: batchv1.JobStatus{+ Succeeded: 1,+ },+ }+ commitPod := &corev1.Pod{+ ObjectMeta: metav1.ObjectMeta{+ Name: "test-snapshot-commit-abcde",+ Namespace: "default",+ Labels: map[string]string{+ "job-name": "test-snapshot-commit",+ },+ },+ Status: corev1.PodStatus{+ ContainerStatuses: []corev1.ContainerStatus{+ {+ Name: commitJobContainerName,+ State: corev1.ContainerState{+ Terminated: &corev1.ContainerStateTerminated{+ ExitCode: 0,+ Message: `{"containers":[{"name":"main","image":"registry/test-main:tag","digest":"sha256:main"}]}`,+ },+ },+ },+ },+ },+ }++ r := newTestSnapshotReconciler(snapshot, job, commitPod)++ result, err := r.handleCommitting(context.Background(), snapshot)+ require.NoError(t, err)+ assert.Equal(t, ctrl.Result{}, result)++ updated := &sandboxv1alpha1.SandboxSnapshot{}+ require.NoError(t, r.Get(context.Background(), types.NamespacedName{Name: "test-snapshot", Namespace: "default"}, updated))+ assert.Equal(t, sandboxv1alpha1.SandboxSnapshotPhaseSucceed, updated.Status.Phase)+ require.Len(t, updated.Status.Containers, 1)+ assert.Equal(t, "sha256:main", updated.Status.Containers[0].ImageDigest)+}++func findSnapshotCondition(conditions []sandboxv1alpha1.SandboxSnapshotCondition, conditionType sandboxv1alpha1.SandboxSnapshotConditionType) *sandboxv1alpha1.SandboxSnapshotCondition {+ for i := range conditions {+ if conditions[i].Type == conditionType {+ return &conditions[i]+ }+ }+ return nil+}+func TestUpdateSnapshotStatus_DoesNotDowngradeSucceededSnapshot(t *testing.T) {snapshot := &sandboxv1alpha1.SandboxSnapshot{ObjectMeta: metav1.ObjectMeta{diff --git a/kubernetes/internal/controller/sandboxsnapshot_lifecycle.go b/kubernetes/internal/controller/sandboxsnapshot_lifecycle.goindex efea529ae..2e07fc788 100644--- a/kubernetes/internal/controller/sandboxsnapshot_lifecycle.go+++ b/kubernetes/internal/controller/sandboxsnapshot_lifecycle.go@@ -823,6 +823,24 @@ func (r *SandboxSnapshotReconciler) updateSnapshotStatusFromSucceededCommitJob(clatest.Status.Containers[i].ImageDigest = digest}}+ // resume restores rootfs-v1 containers exclusively by digest, so a+ // snapshot published without them can never be resumed once+ // completePause has deleted the pods. The commit result is the only+ // source of those digests and lives only in the commit pod.+ if latest.Status.Format == sandboxv1alpha1.SandboxSnapshotFormatRootfsV1 &&+ latest.Status.Phase != sandboxv1alpha1.SandboxSnapshotPhaseSucceed {+ if missing := containersWithoutDigest(latest.Status.Containers); len(missing) > 0 {+ reason := "CommitResultIncomplete"+ message := fmt.Sprintf("commit job succeeded without image digests for containers: %s", strings.Join(missing, ", "))+ if !found {+ reason = "CommitResultUnavailable"+ message = fmt.Sprintf("commit job succeeded but its result is no longer available; image digests were not recorded for containers: %s", strings.Join(missing, ", "))+ }+ latest.Status.Phase = sandboxv1alpha1.SandboxSnapshotPhaseFailed+ applySnapshotPhaseConditions(&latest.Status, reason, message)+ return r.Status().Update(ctx, latest)+ }+ }if latest.Status.Format == sandboxv1alpha1.SandboxSnapshotFormatQEMUV1 {if !found || result.VirtualMachine == nil {return fmt.Errorf("successful QEMU commit job did not report virtualMachine result")@@ -853,6 +871,16 @@ func (r *SandboxSnapshotReconciler) updateSnapshotStatusFromSucceededCommitJob(c})}+func containersWithoutDigest(containers []sandboxv1alpha1.ContainerSnapshot) []string {+ var missing []string+ for _, container := range containers {+ if container.ImageDigest == "" {+ missing = append(missing, container.ContainerName)+ }+ }+ return missing+}+func (r *SandboxSnapshotReconciler) getCommitJobResult(ctx context.Context, namespace, jobName string) (*commitJobResult, bool, error) {for _, labelKey := range []string{"job-name", "batch.kubernetes.io/job-name"} {podList := &corev1.PodList{}