test/e2e: Remove cri-runtime-handler annotation

We don't think with the latest nydus-snapshotter changes, so that cri-runtime annotation is needed, so try drop the comments completely Signed-off-by: stevenhorsman <[email protected]>
confidential-containers · May 17, 2024 · ced41b0 · ced41b0
1 parent e98ee67
commit ced41b0
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/src/cloud-api-adaptor/test/e2e/common.go b/src/cloud-api-adaptor/test/e2e/common.go
@@ -121,12 +121,8 @@ func WithLabel(data map[string]string) PodOption {
 
 func NewPod(namespace string, podName string, containerName string, imageName string, options ...PodOption) *corev1.Pod {
 	runtimeClassName := "kata-remote"
-	// Comment out adding runtime-handler until nydus-snapshotter is stable
-	// annotationData := map[string]string{
-	// 	"io.containerd.cri.runtime-handler": runtimeClassName,
-	// }
 	pod := &corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{Name: podName, Namespace: namespace /*, Annotations: annotationData*/},
+		ObjectMeta: metav1.ObjectMeta{Name: podName, Namespace: namespace},
 		Spec: corev1.PodSpec{
 			Containers:       []corev1.Container{{Name: containerName, Image: imageName, ImagePullPolicy: corev1.PullAlways}},
 			RuntimeClassName: &runtimeClassName,
@@ -168,17 +164,12 @@ func NewSecret(namespace, name string, data map[string][]byte, secretType corev1
 // NewJob returns a new job
 func NewJob(namespace, name string) *batchv1.Job {
 	runtimeClassName := "kata-remote"
-	// Comment out adding runtime-handler until nydus-snapshotter is stable
-	// annotationData := map[string]string{
-	// 	"io.containerd.cri.runtime-handler": runtimeClassName,
-	// }
 	BackoffLimit := int32(8)
 	TerminateGracePeriod := int64(0)
 	return &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
-			// Annotations: annotationData,
 		},
 		Spec: batchv1.JobSpec{
 			Template: corev1.PodTemplateSpec{