e2e: add new doTestNginxDeployment test case

- add a new test case create one nginx deployment with 2 replicas

Signed-off-by: Da Li Liu <liudali@cn.ibm.com>

test/e2e/aws_test.go

@@ -165,3 +165,8 @@ func TestAwsDeletePod(t *testing.T) {
 	assert := NewAWSAssert()
 	doTestDeleteSimplePod(t, assert)
 }
+
+func TestAwsCreateNginxDeployment(t *testing.T) {
+	assert := NewAWSAssert()
+	doTestNginxDeployment(t, assert)
+}

test/e2e/azure_test.go

@@ -44,6 +44,11 @@ func TestCreatePodWithSecretAzure(t *testing.T) {
 	doTestCreatePodWithSecret(t, assert)
 }
 
+func TestCreateNginxDeploymentAzure(t *testing.T) {
+	t.Parallel()
+	doTestNginxDeployment(t, assert)
+}
+
 func checkVMExistence(resourceGroupName, prefixName string) bool {
 	pager := pv.AzureProps.ManagedVmClient.NewListPager(resourceGroupName, nil)
 

test/e2e/common_suite_test.go

@@ -21,7 +21,7 @@ import (
 // doTestCreateSimplePod tests a simple peer-pod can be created.
 func doTestCreateSimplePod(t *testing.T, assert CloudAssert) {
 	namespace := envconf.RandomName("default", 7)
-	pod := newBusyboxPodWithName(namespace, "simplePeerPod-test")
+	pod := newBusyboxPodWithName(namespace, "simple-test")
 	newTestCase(t, "SimplePeerPod", assert, "PodVM is created").withPod(pod).run()
 }
 

test/e2e/ibmcloud_test.go

@@ -495,6 +495,13 @@ func TestPodVMwithAnnotationsLargerCPU(t *testing.T) {
 	doTestPodVMwithAnnotationsLargerCPU(t, assert)
 }
 
+func TestIBMCreateNginxDeployment(t *testing.T) {
+	assert := IBMCloudAssert{
+		vpc: pv.IBMCloudProps.VPC,
+	}
+	doTestNginxDeployment(t, assert)
+}
+
 // IBMCloudAssert implements the CloudAssert interface for ibmcloud.
 type IBMCloudAssert struct {
 	vpc *vpcv1.VpcV1

test/e2e/libvirt_test.go

@@ -67,6 +67,11 @@ func TestLibvirtCreatePeerPodAndCheckEnvVariableLogsWithImageAndDeployment(t *te
 	doTestCreatePeerPodAndCheckEnvVariableLogsWithImageAndDeployment(t, assert)
 }
 
+func TestLibvirtCreateNginxDeployment(t *testing.T) {
+	assert := LibvirtAssert{}
+	doTestNginxDeployment(t, assert)
+}
+
 /*
 Failing due to issues will pulling image (ErrImagePull)
 func TestLibvirtCreatePeerPodWithLargeImage(t *testing.T) {

test/e2e/nginx_deployment_test.go

@@ -0,0 +1,193 @@
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package e2e
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/e2e-framework/klient"
+	"sigs.k8s.io/e2e-framework/klient/k8s"
+	"sigs.k8s.io/e2e-framework/klient/wait"
+	"sigs.k8s.io/e2e-framework/klient/wait/conditions"
+	envconf "sigs.k8s.io/e2e-framework/pkg/envconf"
+	"sigs.k8s.io/e2e-framework/pkg/features"
+)
+
+const WAIT_NGINX_DEPLOYMENT_TIMEOUT = time.Second * 900
+
+type deploymentOption func(*appsv1.Deployment)
+
+func withReplicaCount(replicas int32) deploymentOption {
+	return func(deployment *appsv1.Deployment) {
+		deployment.Spec.Replicas = &replicas
+	}
+}
+
+func newDeployment(namespace, deploymentName, containerName, imageName string, options ...deploymentOption) *appsv1.Deployment {
+	runtimeClassName := "kata-remote"
+	deployment := &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      deploymentName,
+			Namespace: namespace,
+		},
+		Spec: appsv1.DeploymentSpec{
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{"app": containerName},
+			},
+			Template: v1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{"app": containerName},
+				},
+				Spec: v1.PodSpec{
+					RuntimeClassName: &runtimeClassName,
+					Containers: []v1.Container{
+						{
+							Name:  containerName,
+							Image: imageName,
+							ReadinessProbe: &v1.Probe{
+								ProbeHandler: v1.ProbeHandler{
+									HTTPGet: &v1.HTTPGetAction{
+										Path: "/",
+										Port: intstr.FromInt(80),
+									},
+								},
+								InitialDelaySeconds: 5,
+								PeriodSeconds:       5,
+								TimeoutSeconds:      1,
+								FailureThreshold:    3,
+							},
+							LivenessProbe: &v1.Probe{
+								ProbeHandler: v1.ProbeHandler{
+									HTTPGet: &v1.HTTPGetAction{
+										Path: "/",
+										Port: intstr.FromInt(80),
+									},
+								},
+								InitialDelaySeconds: 3,
+								PeriodSeconds:       30,
+								TimeoutSeconds:      1,
+								FailureThreshold:    3,
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, option := range options {
+		option(deployment)
+	}
+	return deployment
+}
+
+func doTestNginxDeployment(t *testing.T, assert CloudAssert) {
+	namespace := envconf.RandomName("default", 7)
+	deploymentName := "nginx-deployment"
+	containerName := "nginx"
+	imageName := "nginx:latest"
+	replicas := int32(2)
+	deployment := newDeployment(namespace, deploymentName, containerName, imageName, withReplicaCount(replicas))
+
+	nginxImageFeature := features.New("Nginx image deployment test").
+		WithSetup("Create nginx deployment", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
+			client, err := cfg.NewClient()
+			if err != nil {
+				t.Fatal(err)
+			}
+			log.Info("Creating nginx deployment...")
+			if err = client.Resources().Create(ctx, deployment); err != nil {
+				t.Fatal(err)
+			}
+			waitForNginxDeploymentAvailable(ctx, t, client, deployment, replicas)
+			log.Info("nginx deployment is available now")
+			return ctx
+		}).
+		Assess("Access for nginx deployment test", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
+			client, err := cfg.NewClient()
+			if err != nil {
+				t.Fatal(err)
+			}
+			var podlist v1.PodList
+			if err := client.Resources(deployment.ObjectMeta.Namespace).List(ctx, &podlist); err != nil {
+				t.Fatal(err)
+			}
+			for _, pod := range podlist.Items {
+				if pod.ObjectMeta.Labels["app"] == "nginx" {
+					assert.HasPodVM(t, pod.ObjectMeta.Name)
+				}
+			}
+			return ctx
+		}).
+		Teardown(func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
+			client, err := cfg.NewClient()
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			log.Info("Deleting webserver deployment...")
+			duration := 2 * time.Minute
+			if err = client.Resources().Delete(ctx, deployment); err != nil {
+				t.Fatal(err)
+			}
+			log.Infof("Deleting deployment %s...", deploymentName)
+			if err = wait.For(conditions.New(
+				client.Resources()).ResourceDeleted(deployment),
+				wait.WithInterval(5*time.Second),
+				wait.WithTimeout(duration)); err != nil {
+				t.Fatal(err)
+			}
+			log.Infof("Deployment %s has been successfully deleted within %.0fs", deploymentName, duration.Seconds())
+
+			return ctx
+		}).Feature()
+
+	testEnv.Test(t, nginxImageFeature)
+}
+
+func waitForNginxDeploymentAvailable(ctx context.Context, t *testing.T, client klient.Client, deployment *appsv1.Deployment, rc int32) {
+	if err := wait.For(conditions.New(client.Resources()).ResourceMatch(deployment, func(object k8s.Object) bool {
+		deployObj, ok := object.(*appsv1.Deployment)
+		if !ok {
+			log.Printf("Not a Deployment object: %v", object)
+			return false
+		}
+		log.Printf("Current deployment available replicas: %d", deployObj.Status.AvailableReplicas)
+		return deployObj.Status.AvailableReplicas == rc
+	}), wait.WithTimeout(WAIT_NGINX_DEPLOYMENT_TIMEOUT)); err != nil {
+		var podlist v1.PodList
+		if err := client.Resources(deployment.ObjectMeta.Namespace).List(ctx, &podlist); err != nil {
+			t.Fatal(err)
+		}
+		for _, pod := range podlist.Items {
+			if pod.ObjectMeta.Labels["app"] == "nginx" {
+				//Added logs for debugging nightly tests
+				fmt.Printf("===================\n")
+				t.Logf("Debug infor for pod: %v", pod.ObjectMeta.Name)
+				yamlData, err := yaml.Marshal(pod.Status)
+				if err != nil {
+					fmt.Println("Error marshaling pod.Status to YAML: ", err.Error())
+				} else {
+					t.Logf("Current Pod State: %v", string(yamlData))
+				}
+				if pod.Status.Phase == v1.PodRunning {
+					fmt.Printf("Log of the pod %.v \n===================\n", pod.Name)
+					podLogString, _ := getPodLog(ctx, client, pod)
+					fmt.Println(podLogString)
+					fmt.Printf("===================\n")
+				}
+			}
+		}
+		t.Fatal(err)
+	}
+}