test

Author: LiangquanLi930

test/e2e/azure_autoscaling_from_zero.go

@@ -64,8 +64,8 @@ type AutoscalingFromZeroSpecInput struct {
 }
 
 // AutoscalingFromZeroSpec implements a test that verifies autoscaling from zero functionality.
-// It creates a MachineDeployment scaled to 0, deploys Cluster Autoscaler, triggers scale-up
-// with a workload, and verifies machines can scale from 0 to 1+.
+// It adds autoscaler annotations to an existing MachineDeployment, deploys Cluster Autoscaler,
+// triggers scale-up with a workload, and verifies machines can scale from 0 to 1+.
 func AutoscalingFromZeroSpec(ctx context.Context, inputGetter func() AutoscalingFromZeroSpecInput) {
 	input := inputGetter()
 	Expect(input.BootstrapClusterProxy).NotTo(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil")
@@ -91,7 +91,7 @@ func AutoscalingFromZeroSpec(ctx context.Context, inputGetter func() Autoscaling
 
 	// Step 1: Add autoscaler annotations to existing MachineDeployment
 	By("Adding autoscaler annotations to existing MachineDeployment")
-	autoscaleMD = addAutoscalerAnnotationsToMachineDeployment(ctx, mgmtClient, input.Namespace.Name, input.ClusterName)
+	autoscaleMD = addAutoscalerAnnotationsToMachineDeployment(ctx, mgmtClient, input.Namespace.Name, input.ClusterName, input.WaitIntervals)
 
 	// Step 2: Wait for MachineDeployment to stabilize at 0 replicas
 	By("Waiting for MachineDeployment to stabilize at 0 replicas")
@@ -135,12 +135,22 @@ func AutoscalingFromZeroSpec(ctx context.Context, inputGetter func() Autoscaling
 
 	// Step 6: Create nginx deployment to trigger scale-up in workload cluster
 	By("Creating nginx deployment to trigger scale-up")
-	_, err = deploymentBuilder.Create("nginx:1.21", "autoscale-trigger", corev1.NamespaceDefault).
+	deployment, err := deploymentBuilder.Create("nginx:1.21", "autoscale-trigger", corev1.NamespaceDefault).
 		SetReplicas(2).
 		SetResourceRequests("100m", "128Mi").
 		Deploy(ctx, workloadClientset)
 	Expect(err).NotTo(HaveOccurred())
 
+	// Clean up the deployment after the test
+	defer func() {
+		By("Cleaning up nginx deployment")
+		err := workloadClientset.AppsV1().Deployments(corev1.NamespaceDefault).
+			Delete(ctx, deployment.Name, metav1.DeleteOptions{})
+		if err != nil && !apierrors.IsNotFound(err) {
+			Logf("Failed to delete deployment %s: %v", deployment.Name, err)
+		}
+	}()
+
 	// Step 7: Wait for CA to scale MachineDeployment from 0 to 1+
 	By("Waiting for Cluster Autoscaler to scale MachineDeployment to 1+")
 	Eventually(func(g Gomega) {
@@ -149,13 +159,26 @@ func AutoscalingFromZeroSpec(ctx context.Context, inputGetter func() Autoscaling
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(md.Spec.Replicas).NotTo(BeNil())
 		g.Expect(*md.Spec.Replicas).To(BeNumerically(">=", 1))
+		g.Expect(md.Status.Replicas).To(HaveValue(BeNumerically(">=", 1)))
+		g.Expect(md.Status.ReadyReplicas).To(HaveValue(BeNumerically(">=", 1)))
 	}, input.WaitIntervals...).Should(Succeed())
 
-	Byf("Cluster Autoscaler scaled MachineDeployment from 0 to 1+ - scale-up from zero test PASSED!")
+	Byf("Cluster Autoscaler scaled MachineDeployment from 0 to 1+")
+
+	// Step 8: Verify nginx deployment is ready
+	By("Verifying nginx deployment is ready in workload cluster")
+	Eventually(func(g Gomega) {
+		nginxDeployment, err := workloadClientset.AppsV1().Deployments(corev1.NamespaceDefault).
+			Get(ctx, deployment.Name, metav1.GetOptions{})
+		g.Expect(err).NotTo(HaveOccurred())
+		g.Expect(nginxDeployment.Status.ReadyReplicas).To(Equal(int32(2)))
+	}, input.WaitIntervals...).Should(Succeed())
+
+	Byf("Nginx deployment is ready - scale-up from zero test PASSED!")
 }
 
 // addAutoscalerAnnotationsToMachineDeployment adds autoscaler annotations to the existing MachineDeployment.
-func addAutoscalerAnnotationsToMachineDeployment(ctx context.Context, mgmtClient client.Client, namespace, clusterName string) *clusterv1.MachineDeployment {
+func addAutoscalerAnnotationsToMachineDeployment(ctx context.Context, mgmtClient client.Client, namespace, clusterName string, waitIntervals []interface{}) *clusterv1.MachineDeployment {
 	mdList := &clusterv1.MachineDeploymentList{}
 	err := mgmtClient.List(ctx, mdList,
 		client.InNamespace(namespace),
@@ -164,20 +187,34 @@ func addAutoscalerAnnotationsToMachineDeployment(ctx context.Context, mgmtClient
 		})
 	Expect(err).NotTo(HaveOccurred())
 	Expect(mdList.Items).To(HaveLen(1), "Expected exactly one MachineDeployment for cluster %s, found %d", clusterName, len(mdList.Items))
-	md := &mdList.Items[0]
 
-	// Add autoscaler annotations
-	if md.Annotations == nil {
-		md.Annotations = make(map[string]string)
+	mdKey := client.ObjectKey{
+		Namespace: mdList.Items[0].Namespace,
+		Name:      mdList.Items[0].Name,
 	}
-	md.Annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size"] = "0"
-	md.Annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size"] = "3"
 
-	// Update the MachineDeployment
-	err = mgmtClient.Update(ctx, md)
-	Expect(err).NotTo(HaveOccurred())
+	var updatedMD *clusterv1.MachineDeployment
+
+	Eventually(func(g Gomega) {
+		md := &clusterv1.MachineDeployment{}
+		err := mgmtClient.Get(ctx, mdKey, md)
+		g.Expect(err).NotTo(HaveOccurred())
+
+		// Add autoscaler annotations
+		if md.Annotations == nil {
+			md.Annotations = make(map[string]string)
+		}
+		md.Annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size"] = "0"
+		md.Annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size"] = "3"
+
+		// Update the MachineDeployment
+		err = mgmtClient.Update(ctx, md)
+		g.Expect(err).NotTo(HaveOccurred())
+
+		updatedMD = md
+	}, waitIntervals...).Should(Succeed())
 
-	return md
+	return updatedMD
 }
 
 // deployClusterAutoscalerRBAC deploys the RBAC resources for Cluster Autoscaler to management cluster.

test/e2e/kubernetes/deployment/deployment.go

@@ -245,7 +245,6 @@ func (d *Builder) AddPodAntiAffinity(affinity corev1.PodAntiAffinity) *Builder {
 }
 
 // SetResourceRequests sets CPU and memory resource requests for the first container.
-// For multi-container pods, use SetResourceRequestsForContainer.
 func (d *Builder) SetResourceRequests(cpu, memory string) *Builder {
 	if len(d.deployment.Spec.Template.Spec.Containers) > 0 {
 		d.deployment.Spec.Template.Spec.Containers[0].Resources.Requests = corev1.ResourceList{