Fix e2e test to utilise chart which is able to install with wait option

Author: dmvolod

controllers/helmchartproxy/helmchartproxy_controller_phases.go

@@ -226,6 +226,9 @@ func constructHelmReleaseProxy(existing *addonsv1alpha1.HelmReleaseProxy, helmCh
 		if !cmp.Equal(existing.Spec.Values, parsedValues) {
 			changed = true
 		}
+		if existing.Spec.ReleaseDrift != helmChartProxy.Spec.ReleaseDrift {
+			changed = true
+		}
 
 		if !changed {
 			return nil
@@ -289,6 +292,9 @@ func shouldReinstallHelmRelease(ctx context.Context, existing *addonsv1alpha1.He
 	case existing.Spec.ReleaseNamespace != helmChartProxy.Spec.ReleaseNamespace:
 		log.V(2).Info("ReleaseNamespace changed", "existing", existing.Spec.ReleaseNamespace, "helmChartProxy", helmChartProxy.Spec.ReleaseNamespace)
 		return true
+	case existing.Spec.ReleaseDrift != helmChartProxy.Spec.ReleaseDrift:
+		log.V(2).Info("ReleaseDrift changed", "existing", existing.Spec.ReleaseDrift, "helmChartProxy", helmChartProxy.Spec.ReleaseDrift)
+		return true
 	}
 
 	return false

test/e2e/helm_releasedrift.go

@@ -35,6 +35,13 @@ import (
 	"sigs.k8s.io/cluster-api/test/framework"
 )
 
+type ValidationType string
+
+const (
+	ValidationEventually   ValidationType = "Eventually"
+	ValidationConsistently ValidationType = "Consistently"
+)
+
 // HelmReleaseDriftInput specifies the input for Helm release drift Deployment validation and verifying that it was successful.
 type HelmReleaseDriftInput struct {
 	BootstrapClusterProxy      framework.ClusterProxy
@@ -44,6 +51,7 @@ type HelmReleaseDriftInput struct {
 	UpdatedDeploymentReplicas  int32
 	ExpectedDeploymentReplicas int32
 	ExpectedRevision           int
+	Validation                 ValidationType
 }
 
 func HelmReleaseDriftWithDeployment(ctx context.Context, inputGetter func() HelmReleaseDriftInput) {
@@ -54,6 +62,7 @@ func HelmReleaseDriftWithDeployment(ctx context.Context, inputGetter func() Helm
 	)
 	input = inputGetter()
 	hcp := input.HelmChartProxy
+	Expect(input.Validation).NotTo(BeEmpty(), "HelmReleaseDriftInput must contains validation type to be defined")
 
 	// Get workload Cluster proxy
 	By("creating a clusterctl proxy to the workload cluster")
@@ -73,17 +82,31 @@ func HelmReleaseDriftWithDeployment(ctx context.Context, inputGetter func() Helm
 	Expect(err).NotTo(HaveOccurred())
 
 	deploymentName := ctrlclient.ObjectKeyFromObject(deployment)
-	// Wait for Helm release Deployment replicas to be returned back
-	Eventually(func() error {
-		if err := mgmtClient.Get(ctx, deploymentName, deployment); err != nil {
-			return err
-		}
-		if *deployment.Spec.Replicas != input.ExpectedDeploymentReplicas && deployment.Status.ReadyReplicas != input.ExpectedDeploymentReplicas {
-			return fmt.Errorf("expected Deployment replicas to be %d, got %d", input.ExpectedDeploymentReplicas, deployment.Status.ReadyReplicas)
-		}
-
-		return nil
-	}, e2eConfig.GetIntervals("default", "wait-helm-release-drift")...).Should(Succeed())
+	if input.Validation == ValidationEventually {
+		// Wait for Helm release Deployment replicas to be returned back
+		Eventually(func() error {
+			if err = mgmtClient.Get(ctx, deploymentName, deployment); err != nil {
+				return err
+			}
+			if *deployment.Spec.Replicas != input.ExpectedDeploymentReplicas && deployment.Status.ReadyReplicas != input.ExpectedDeploymentReplicas {
+				return fmt.Errorf("expected Deployment replicas to be %d, got %d", input.ExpectedDeploymentReplicas, deployment.Status.ReadyReplicas)
+			}
+
+			return nil
+		}, e2eConfig.GetIntervals("default", "wait-helm-release-drift")...).Should(Succeed())
+	}
+	if input.Validation == ValidationConsistently {
+		Consistently(func() error {
+			if err = mgmtClient.Get(ctx, deploymentName, deployment); err != nil {
+				return err
+			}
+			if *deployment.Spec.Replicas != input.ExpectedDeploymentReplicas && deployment.Status.ReadyReplicas != input.ExpectedDeploymentReplicas {
+				return fmt.Errorf("expected Deployment replicas to be %d, got %d", input.ExpectedDeploymentReplicas, deployment.Status.ReadyReplicas)
+			}
+
+			return nil
+		}, e2eConfig.GetIntervals("default", "wait-helm-release-drift")...).Should(Succeed())
+	}
 
 	helmUpgradeInput := HelmUpgradeInput{
 		BootstrapClusterProxy: workloadClusterProxy,

test/e2e/helm_test.go

@@ -220,7 +220,7 @@ var _ = Describe("Workload cluster creation", func() {
 			})
 		})
 
-		It("Install and manage Helm chart with ReleaseDrift option enabled", func() {
+		FIt("Install and manage Helm chart with ReleaseDrift option enabled", func() {
 			clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
 			clusterctl.ApplyClusterTemplateAndWait(ctx, createApplyClusterTemplateInput(
 				specName,
@@ -235,7 +235,7 @@ var _ = Describe("Workload cluster creation", func() {
 
 			hcp := &addonsv1alpha1.HelmChartProxy{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "nginx-ingress",
+					Name:      "ahoy",
 					Namespace: namespace.Name,
 				},
 				Spec: addonsv1alpha1.HelmChartProxySpec{
@@ -244,13 +244,17 @@ var _ = Describe("Workload cluster creation", func() {
 							"nginxIngress": "enabled",
 						},
 					},
-					ReleaseName:       "nginx-ingress",
-					ReleaseNamespace:  "nginx-namespace",
-					ChartName:         "nginx-ingress",
-					RepoURL:           "https://helm.nginx.com/stable",
+					ChartName:         "hello-world",
+					RepoURL:           "https://helm.github.io/examples",
+					ReleaseName:       "ahoy",
+					ReleaseNamespace:  "ahoy-namespace",
 					ValuesTemplate:    nginxValues,
-					ReleaseDrift:      true,
 					ReconcileStrategy: string(addonsv1alpha1.ReconcileStrategyContinuous),
+					ReleaseDrift:      true,
+					Options: addonsv1alpha1.HelmOptions{
+						Wait:    true,
+						Timeout: &metav1.Duration{Duration: 5 * time.Minute},
+					},
 				},
 			}
 
@@ -267,7 +271,7 @@ var _ = Describe("Workload cluster creation", func() {
 			})
 
 			// Updating Nginx deployment and waiting for the release drift
-			By("Updating Nginx deployment and waiting for the release drift", func() {
+			By("Updating Nginx deployment and waiting for release drift", func() {
 				HelmReleaseDriftWithDeployment(ctx, func() HelmReleaseDriftInput {
 					return HelmReleaseDriftInput{
 						BootstrapClusterProxy:      bootstrapClusterProxy,
@@ -277,6 +281,37 @@ var _ = Describe("Workload cluster creation", func() {
 						UpdatedDeploymentReplicas:  2,
 						ExpectedDeploymentReplicas: 1,
 						ExpectedRevision:           2,
+						Validation:                 ValidationEventually,
+					}
+				})
+			})
+
+			// Update existing Helm chart
+			By("Updating HelmChartProxy disabling release drift option", func() {
+				hcp.Spec.ReleaseDrift = false
+				HelmUpgradeSpec(ctx, func() HelmUpgradeInput {
+					return HelmUpgradeInput{
+						BootstrapClusterProxy: bootstrapClusterProxy,
+						Namespace:             namespace,
+						ClusterName:           clusterName,
+						HelmChartProxy:        hcp,
+						ExpectedRevision:      1,
+					}
+				})
+			})
+
+			// Updating Nginx deployment and waiting for the release drift
+			By("Updating Nginx deployment and waiting release drift to be inactive for a long time", func() {
+				HelmReleaseDriftWithDeployment(ctx, func() HelmReleaseDriftInput {
+					return HelmReleaseDriftInput{
+						BootstrapClusterProxy:      bootstrapClusterProxy,
+						Namespace:                  namespace,
+						ClusterName:                clusterName,
+						HelmChartProxy:             hcp,
+						UpdatedDeploymentReplicas:  2,
+						ExpectedDeploymentReplicas: 2,
+						ExpectedRevision:           1,
+						Validation:                 ValidationConsistently,
 					}
 				})
 			})