Fix e2e tests for empty helm values

Author: dmvolod

controllers/helmchartproxy/helmchartproxy_controller_phases.go

@@ -226,9 +226,6 @@ 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

test/e2e/helm_test.go

@@ -248,7 +248,6 @@ var _ = Describe("Workload cluster creation", func() {
 					RepoURL:           "https://helm.github.io/examples",
 					ReleaseName:       "ahoy",
 					ReleaseNamespace:  "ahoy-namespace",
-					ValuesTemplate:    nginxValues,
 					ReconcileStrategy: string(addonsv1alpha1.ReconcileStrategyContinuous),
 					ReleaseDrift:      true,
 					Options: addonsv1alpha1.HelmOptions{

test/e2e/helpers.go

@@ -357,11 +357,15 @@ func normalizeHelmReleaseValues(_ context.Context, helmReleaseProxy *addonsv1alp
 
 	// Normalize the HelmReleaseProxy values.
 	var normalizedValues map[string]interface{}
-	Expect(yaml.Unmarshal([]byte(helmReleaseProxy.Spec.Values), &normalizedValues)).To(Succeed())
+	if helmReleaseProxy.Spec.Values != "" {
+		Expect(yaml.Unmarshal([]byte(helmReleaseProxy.Spec.Values), &normalizedValues)).To(Succeed())
+	}
 
 	// Normalize the Helm release values.
 	var normalizedReleaseValues map[string]interface{}
-	Expect(yaml.Unmarshal(releaseValues, &normalizedReleaseValues)).To(Succeed())
+	if helmReleaseProxy.Spec.Values != "" {
+		Expect(yaml.Unmarshal(releaseValues, &normalizedReleaseValues)).To(Succeed())
+	}
 
 	// Normalize the Helm release values.
 	Expect(normalizedReleaseValues).To(Equal(normalizedValues))