Remove adoption of resources in old API versions

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>

Author: matheuscscp

internal/controller/helmrelease_controller.go

@@ -27,7 +27,6 @@ import (
 	"github.com/fluxcd/cli-utils/pkg/kstatus/polling/engine"
 	celtypes "github.com/google/cel-go/common/types"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	helmrelease "helm.sh/helm/v4/pkg/release/v1"
 	corev1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -70,9 +69,7 @@ import (
 	"github.com/fluxcd/helm-controller/internal/features"
 	"github.com/fluxcd/helm-controller/internal/kube"
 	"github.com/fluxcd/helm-controller/internal/loader"
-	"github.com/fluxcd/helm-controller/internal/postrender"
 	intreconcile "github.com/fluxcd/helm-controller/internal/reconcile"
-	"github.com/fluxcd/helm-controller/internal/release"
 )
 
 // +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch;create;update;patch;delete
@@ -369,19 +366,6 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
 		conditions.MarkUnknown(obj, meta.ReadyCondition, meta.ProgressingReason, "reconciliation in progress")
 	}
 
-	// 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, statusReader, obj); err != nil {
-			log.Error(err, "failed to adopt v2beta1 release state")
-		}
-		r.adoptPostRenderersStatus(obj)
-	}
-
 	// If the release target configuration has changed, we need to uninstall the
 	// previous release target first. If we did not do this, the installation would
 	// fail due to resources already existing.
@@ -681,81 +665,6 @@ func (r *HelmReleaseReconciler) evalReadyExpr(
 	return celExpr.EvaluateBoolean(ctx, vars)
 }
 
-// adoptLegacyRelease attempts to adopt a v2beta1 release into a v2
-// release.
-// This is done by retrieving the last successful release from the Helm storage
-// and converting it to a v2 release snapshot.
-// If the v2beta1 release has already been adopted, this function is a no-op.
-func (r *HelmReleaseReconciler) adoptLegacyRelease(ctx context.Context,
-	getter genericclioptions.RESTClientGetter, statusReader engine.StatusReader, obj *v2.HelmRelease) error {
-
-	if obj.Status.LastReleaseRevision < 1 || len(obj.Status.History) > 0 {
-		return nil
-	}
-
-	var (
-		log              = ctrl.LoggerFrom(ctx).V(logger.DebugLevel)
-		storageNamespace = obj.GetStorageNamespace()
-		releaseNamespace = obj.GetReleaseNamespace()
-		releaseName      = obj.GetReleaseName()
-		version          = obj.Status.LastReleaseRevision
-	)
-
-	log.Info("adopting %s/%s.v%d release from v2beta1 state", releaseNamespace, releaseName, version)
-
-	// Construct config factory for current release.
-	cfg, err := action.NewConfigFactory(getter,
-		action.WithStorage(action.DefaultStorageDriver, storageNamespace),
-		action.WithStorageLog(action.NewTraceLogger(ctx)),
-		action.WithStatusReader(statusReader),
-	)
-	if err != nil {
-		return err
-	}
-
-	// Get the last successful release based on the observation for the v2beta1
-	// object.
-	rls, err := cfg.NewStorage().Get(releaseName, version)
-	if err != nil {
-		return err
-	}
-
-	// Convert it to a v2 release snapshot.
-	rlsTyped, ok := rls.(*helmrelease.Release)
-	if !ok {
-		return fmt.Errorf("only the Chart API v2 is supported")
-	}
-	snap := release.ObservedToSnapshot(release.ObserveRelease(rlsTyped))
-
-	// If tests are enabled, include them as well.
-	if obj.GetTest().Enable {
-		snap.SetTestHooks(release.TestHooksFromRelease(rlsTyped))
-	}
-
-	// Adopt it as the current release in the history.
-	obj.Status.History = append(obj.Status.History, snap)
-	obj.Status.StorageNamespace = storageNamespace
-
-	// Erase the last release revision from the status.
-	obj.Status.LastReleaseRevision = 0
-
-	return nil
-}
-
-// adoptPostRenderersStatus attempts to set obj.Status.ObservedPostRenderersDigest
-// for v2beta1 and v2beta2 HelmReleases.
-func (*HelmReleaseReconciler) adoptPostRenderersStatus(obj *v2.HelmRelease) {
-	if obj.GetGeneration() != obj.Status.ObservedGeneration {
-		return
-	}
-
-	// if we have a reconciled object with PostRenderers not reflected in the
-	// status, we need to update the status.
-	if obj.Spec.PostRenderers != nil && obj.Status.ObservedPostRenderersDigest == "" {
-		obj.Status.ObservedPostRenderersDigest = postrender.Digest(digest.Canonical, obj.Spec.PostRenderers).String()
-	}
-}
-
 func (r *HelmReleaseReconciler) buildRESTClientGetter(ctx context.Context, obj *v2.HelmRelease) (genericclioptions.RESTClientGetter, error) {
 	opts := []kube.Option{
 		kube.WithNamespace(obj.GetReleaseNamespace()),

internal/controller/helmrelease_controller_test.go

@@ -3300,175 +3300,6 @@ dep.metadata.generation == dep.status.observedGeneration
 	}
 }
 
-func TestHelmReleaseReconciler_adoptLegacyRelease(t *testing.T) {
-	tests := []struct {
-		name                      string
-		releases                  func(namespace string) []*helmrelease.Release
-		spec                      func(spec *v2.HelmReleaseSpec)
-		status                    v2.HelmReleaseStatus
-		expectHistory             func(releases []*helmrelease.Release) v2.Snapshots
-		expectLastReleaseRevision int
-		wantErr                   bool
-	}{
-		{
-			name: "adopts last release revision",
-			releases: func(namespace string) []*helmrelease.Release {
-				return []*helmrelease.Release{
-					testutil.BuildRelease(&helmrelease.MockReleaseOptions{
-						Name:      "orphaned",
-						Namespace: namespace,
-						Version:   6,
-						Chart:     testutil.BuildChart(),
-						Status:    helmreleasecommon.StatusDeployed,
-					}, testutil.ReleaseWithTestHook()),
-				}
-			},
-			spec: func(spec *v2.HelmReleaseSpec) {
-				spec.ReleaseName = "orphaned"
-			},
-			status: v2.HelmReleaseStatus{
-				LastReleaseRevision: 6,
-			},
-			expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
-				return v2.Snapshots{
-					release.ObservedToSnapshot(release.ObserveRelease(releases[0])),
-				}
-			},
-			expectLastReleaseRevision: 0,
-		},
-		{
-			name: "includes test hooks if enabled",
-			releases: func(namespace string) []*helmrelease.Release {
-				return []*helmrelease.Release{
-					testutil.BuildRelease(&helmrelease.MockReleaseOptions{
-						Name:      "orphaned-with-hooks",
-						Namespace: namespace,
-						Version:   3,
-						Chart:     testutil.BuildChart(testutil.ChartWithTestHook()),
-						Status:    helmreleasecommon.StatusDeployed,
-					}, testutil.ReleaseWithTestHook()),
-				}
-			},
-			spec: func(spec *v2.HelmReleaseSpec) {
-				spec.ReleaseName = "orphaned-with-hooks"
-				spec.Test = &v2.Test{
-					Enable: true,
-				}
-			},
-			status: v2.HelmReleaseStatus{
-				LastReleaseRevision: 3,
-			},
-			expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
-				snap := release.ObservedToSnapshot(release.ObserveRelease(releases[0]))
-				snap.SetTestHooks(release.TestHooksFromRelease(releases[0]))
-
-				return v2.Snapshots{
-					snap,
-				}
-			},
-			expectLastReleaseRevision: 0,
-		},
-		{
-			name: "non-existing release",
-			spec: func(spec *v2.HelmReleaseSpec) {
-				spec.ReleaseName = "non-existing"
-			},
-			status: v2.HelmReleaseStatus{
-				LastReleaseRevision: 2,
-			},
-			expectLastReleaseRevision: 2,
-			wantErr:                   true,
-		},
-		{
-			name: "without last release revision",
-			status: v2.HelmReleaseStatus{
-				LastReleaseRevision: 0,
-			},
-			expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
-				return nil
-			},
-			expectLastReleaseRevision: 0,
-		},
-		{
-			name: "with existing history",
-			status: v2.HelmReleaseStatus{
-				History: v2.Snapshots{
-					{
-						Name: "something",
-					},
-				},
-				LastReleaseRevision: 5,
-			},
-			expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
-				return v2.Snapshots{
-					{
-						Name: "something",
-					},
-				}
-			},
-			expectLastReleaseRevision: 5,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			g := NewWithT(t)
-
-			// Create a test namespace for storing the Helm release mock.
-			ns, err := testEnv.CreateNamespace(context.TODO(), "adopt-release")
-			g.Expect(err).ToNot(HaveOccurred())
-			t.Cleanup(func() {
-				_ = testEnv.Delete(context.TODO(), ns)
-			})
-
-			// Mock a HelmRelease object.
-			obj := &v2.HelmRelease{
-				Spec: v2.HelmReleaseSpec{
-					StorageNamespace: ns.Name,
-				},
-				Status: tt.status,
-			}
-			if tt.spec != nil {
-				tt.spec(&obj.Spec)
-			}
-
-			r := &HelmReleaseReconciler{
-				Client:           testEnv.Client,
-				APIReader:        testEnv.Client,
-				GetClusterConfig: GetTestClusterConfig,
-			}
-
-			// Store the Helm release mock in the test namespace.
-			getter, err := r.buildRESTClientGetter(context.TODO(), obj)
-			g.Expect(err).ToNot(HaveOccurred())
-
-			cfg, err := action.NewConfigFactory(getter, action.WithStorage(helmdriver.SecretsDriverName, obj.GetStorageNamespace()))
-			g.Expect(err).ToNot(HaveOccurred())
-
-			var releases []*helmrelease.Release
-			if tt.releases != nil {
-				releases = tt.releases(ns.Name)
-			}
-			store := helmstorage.Init(cfg.Driver)
-			for _, rls := range releases {
-				g.Expect(store.Create(rls)).To(Succeed())
-			}
-
-			// Adopt the Helm release mock.
-			err = r.adoptLegacyRelease(context.TODO(), getter, nil, obj)
-			g.Expect(err != nil).To(Equal(tt.wantErr), "unexpected error: %s", err)
-
-			// Verify the Helm release mock has been adopted.
-			var expectHistory v2.Snapshots
-			if tt.expectHistory != nil {
-				expectHistory = tt.expectHistory(releases)
-			}
-			g.Expect(obj.Status.History).To(Equal(expectHistory))
-			g.Expect(obj.Status.LastReleaseRevision).To(Equal(tt.expectLastReleaseRevision))
-		})
-	}
-}
-
 func TestHelmReleaseReconciler_buildRESTClientGetter(t *testing.T) {
 	const (
 		namespace = "some-namespace"

internal/features/features.go

@@ -61,6 +61,8 @@ const (
 	// This is enabled by default to support an upgrade path from v2beta1 to v2
 	// without the need to upgrade the Helm release. But it can be disabled to
 	// avoid potential abuse of the adoption mechanism.
+	//
+	// Ignored from v1.5.0, prints a warning if set.
 	AdoptLegacyReleases = "AdoptLegacyReleases"
 
 	// DisableChartDigestTracking disables the tracking of digest changes
@@ -100,8 +102,8 @@ var features = map[string]bool{
 	// opt-in from v0.31
 	OOMWatch: false,
 	// AdoptLegacyReleases
-	// opt-out from v0.37
-	AdoptLegacyReleases: true,
+	// ignored, prints warning from v1.5.0
+	AdoptLegacyReleases: false,
 	// DisableChartDigestTracking
 	// opt-in from v1.3.0
 	DisableChartDigestTracking: false,

main.go

@@ -237,6 +237,11 @@ func main() {
 		os.Exit(1)
 	}
 
+	if ok, _ := features.Enabled(features.AdoptLegacyReleases); ok {
+		setupLog.Info("warning: the 'AdoptLegacyReleases' feature gate is ignored and has no effect since v1.5.0, " +
+			"adoption of HelmRelease resources in legacy API versions is no longer supported")
+	}
+
 	// Set the managedFields owner for resources reconciled from Helm charts.
 	kube.ManagedFieldsManager = controllerName