Add test cases for Summarize() and DetermineReleaseState()

Signed-off-by: Soule BA <[email protected]>
fluxcd · May 7, 2024 · dd97816 · dd97816
1 parent 4069ad4
commit dd97816
Show file tree

Hide file tree

Showing 6 changed files with 468 additions and 319 deletions.
diff --git a/docs/spec/v2/helmreleases.md b/docs/spec/v2/helmreleases.md
@@ -1685,7 +1685,6 @@ attempted to perform a Helm install or upgrade with in the
 The digest is used to determine if the controller should reset the
 [failure counters](#failure-counters) due to a change in the values.
 
-
 ### Last Attempted Revision
 
 The helm-controller reports the revision of the Helm chart it last attempted

diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -353,11 +353,13 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context, patchHelpe
 		conditions.MarkUnknown(obj, meta.ReadyCondition, meta.ProgressingReason, "reconciliation in progress")
 	}
 
-	// Attempt to adopt "legacy" v2beta1 release state on a best-effort basis.
-	// If this fails, the controller will fall back to performing an upgrade
-	// to settle on the desired state.
-	// TODO(hidde): remove this in a future release.
+	// Keep feature flagged code paths separate from the main reconciliation
+	// logic to ensure easy removal when the feature flag is removed.
 	if ok, _ := features.Enabled(features.AdoptLegacyReleases); ok {
+		// Attempt to adopt "legacy" v2beta1 release state on a best-effort basis.
+		// If this fails, the controller will fall back to performing an upgrade
+		// to settle on the desired state.
+		// TODO(hidde): remove this in a future release.
 		if err := r.adoptLegacyRelease(ctx, getter, obj); err != nil {
 			log.Error(err, "failed to adopt v2beta1 release state")
 		}

diff --git a/internal/controller/helmrelease_controller_test.go b/internal/controller/helmrelease_controller_test.go
@@ -1197,9 +1197,6 @@ func TestHelmReleaseReconciler_reconcileReleaseFromHelmChartSource(t *testing.T)
 		chartMock := testutil.BuildChart()
 		chartArtifact, err := testutil.SaveChartAsArtifact(chartMock, digest.SHA256, testServer.URL(), testServer.Root())
 		g.Expect(err).ToNot(HaveOccurred())
-		// copy the artifact to mutate the revision
-		ociArtifact := chartArtifact.DeepCopy()
-		ociArtifact.Revision += "@" + chartArtifact.Digest
 
 		ns, err := testEnv.CreateNamespace(context.TODO(), "mock")
 		g.Expect(err).ToNot(HaveOccurred())

diff --git a/internal/postrender/build.go b/internal/postrender/build.go
@@ -19,10 +19,10 @@ package postrender
 import (
 	"encoding/json"
 
+	"github.com/opencontainers/go-digest"
 	helmpostrender "helm.sh/helm/v3/pkg/postrender"
 
 	v2 "github.com/fluxcd/helm-controller/api/v2"
-	"github.com/opencontainers/go-digest"
 )
 
 // BuildPostRenderers creates the post-renderer instances from a HelmRelease