Finalize e2e tests

Author: dmvolod

api/v1alpha1/helmchartproxy_types.go

@@ -84,6 +84,7 @@ type HelmChartProxySpec struct {
 	// +optional
 	ReconcileStrategy string `json:"reconcileStrategy,omitempty"`
 
+	// TODO (dmvolod) Add notes about release drift description and warning
 	ReleaseDrift bool `json:"releaseDrift,omitempty"`
 
 	// Options represents CLI flags passed to Helm operations (i.e. install, upgrade, delete) and

controllers/helmreleasedrift/test/fake/fakemanifest_controller.go renamed to controllers/helmreleasedrift/test/fake/manifest_controller.go

@@ -383,7 +383,7 @@ func initializeConditions(ctx context.Context, patchHelper *patch.Helper, helmRe
 }
 
 // patchHelmReleaseProxy patches the HelmReleaseProxy object and sets the ReadyCondition as an aggregate of the other condition set.
-// TODO: Is this preferrable to client.Update() calls? Based on testing it seems like it avoids race conditions.
+// TODO: Is this preferable to client.Update() calls? Based on testing it seems like it avoids race conditions.
 func patchHelmReleaseProxy(ctx context.Context, patchHelper *patch.Helper, helmReleaseProxy *addonsv1alpha1.HelmReleaseProxy) error {
 	conditions.SetSummary(helmReleaseProxy,
 		conditions.WithConditions(
@@ -507,7 +507,7 @@ func (r *HelmReleaseProxyReconciler) getCACertificateFromSecret(ctx context.Cont
 // writeCACertificateToFile writes the CA certificate to a temporary file.
 func writeCACertificateToFile(ctx context.Context, caCertificate []byte) (string, error) {
 	log := ctrl.LoggerFrom(ctx)
-	log.V(2).Info("Writing CA certficate to file")
+	log.V(2).Info("Writing CA certificate to file")
 	caCertFile, err := os.CreateTemp("", "ca-*.crt")
 	if err != nil {
 		return "", err

controllers/helmreleaseproxy/helmreleaseproxy_controller.go

@@ -220,7 +220,7 @@ var _ = Describe("Workload cluster creation", func() {
 			})
 		})
 
-		FIt("Install and manage Helm chart with ReleaseDrift option enabled", func() {
+		It("Install and manage Helm chart with ReleaseDrift option enabled", func() {
 			clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
 			clusterctl.ApplyClusterTemplateAndWait(ctx, createApplyClusterTemplateInput(
 				specName,
@@ -258,7 +258,7 @@ var _ = Describe("Workload cluster creation", func() {
 			}
 
 			// Create new Helm chart
-			By("Creating new HelmChartProxy to install nginx", func() {
+			By("Creating new HelmChartProxy to install hello-world chart", func() {
 				HelmInstallSpec(ctx, func() HelmInstallInput {
 					return HelmInstallInput{
 						BootstrapClusterProxy: bootstrapClusterProxy,
@@ -269,8 +269,8 @@ var _ = Describe("Workload cluster creation", func() {
 				})
 			})
 
-			// Updating Nginx deployment and waiting for the release drift
-			By("Updating Nginx deployment and waiting for release drift", func() {
+			// Updating hello-world deployment and waiting for the release drift
+			By("Updating hello-world deployment and waiting for release drift", func() {
 				HelmReleaseDriftWithDeployment(ctx, func() HelmReleaseDriftInput {
 					return HelmReleaseDriftInput{
 						BootstrapClusterProxy:      bootstrapClusterProxy,
@@ -299,8 +299,8 @@ var _ = Describe("Workload cluster creation", func() {
 				})
 			})
 
-			// 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() {
+			// Updating hello-world deployment and waiting for the release drift
+			By("Updating hello-world deployment and waiting release drift to be inactive for a long time", func() {
 				HelmReleaseDriftWithDeployment(ctx, func() HelmReleaseDriftInput {
 					return HelmReleaseDriftInput{
 						BootstrapClusterProxy:      bootstrapClusterProxy,

test/e2e/helm_test.go

@@ -312,6 +312,8 @@ func GetWaitForHelmReleaseProxyReadyInput(ctx context.Context, clusterProxy fram
 			return errors.Errorf("Non-generated ReleaseName mismatch, got `%s` but HelmChartProxy specifies `%s`", hrp.Spec.ReleaseName, helmChartProxy.Spec.ReleaseName)
 		case hrp.Spec.ReleaseNamespace != helmChartProxy.Spec.ReleaseNamespace:
 			return errors.Errorf("ReleaseNamespace mismatch, got `%s` but HelmChartProxy specifies `%s`", hrp.Spec.ReleaseNamespace, helmChartProxy.Spec.ReleaseNamespace)
+		case hrp.Spec.ReleaseDrift != helmChartProxy.Spec.ReleaseDrift:
+			return errors.Errorf("ReleaseDrift mismatch, got `%t` but HelmChartProxy specifies `%t`", hrp.Spec.ReleaseDrift, helmChartProxy.Spec.ReleaseDrift)
 		}
 
 		// If we made it past all the checks, then we have the correct HelmReleaseProxy.