Query Helm charts in all namespaces

internal/controller/helm.go

@@ -22,7 +22,6 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
@@ -215,7 +214,12 @@ func mergeMaps(m1, m2 map[string]any) map[string]any {
 	return out
 }
 
-func (r *UpgradePlanReconciler) upgradeHelmChart(ctx context.Context, upgradePlan *lifecyclev1alpha1.UpgradePlan, releaseChart *lifecyclev1alpha1.HelmChart) (upgrade.HelmChartState, error) {
+func (r *UpgradePlanReconciler) upgradeHelmChart(
+	ctx context.Context,
+	upgradePlan *lifecyclev1alpha1.UpgradePlan,
+	releaseChart *lifecyclev1alpha1.HelmChart,
+	chartResources *helmcattlev1.HelmChartList,
+) (upgrade.HelmChartState, error) {
 	helmRelease, err := retrieveHelmRelease(releaseChart.ReleaseName)
 	if err != nil {
 		if errors.Is(err, helmdriver.ErrReleaseNotFound) {
@@ -224,31 +228,30 @@ func (r *UpgradePlanReconciler) upgradeHelmChart(ctx context.Context, upgradePla
 		return upgrade.ChartStateUnknown, fmt.Errorf("retrieving helm release: %w", err)
 	}
 
-	chart := &helmcattlev1.HelmChart{}
-
-	if err = r.Get(ctx, upgrade.ChartNamespacedName(helmRelease.Name), chart); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return upgrade.ChartStateUnknown, err
-		}
+	chartResource, err := findChartResource(chartResources, releaseChart.ReleaseName)
+	if err != nil {
+		return upgrade.ChartStateFailed, err
+	}
 
+	if chartResource == nil {
 		if helmRelease.Chart.Metadata.Version == releaseChart.Version {
 			return upgrade.ChartStateVersionAlreadyInstalled, nil
 		}
 
 		return upgrade.ChartStateInProgress, r.createHelmChart(ctx, upgradePlan, helmRelease, releaseChart)
 	}
 
-	if chart.Spec.Version != releaseChart.Version {
-		return upgrade.ChartStateInProgress, r.updateHelmChart(ctx, upgradePlan, chart, releaseChart)
+	if chartResource.Spec.Version != releaseChart.Version {
+		return upgrade.ChartStateInProgress, r.updateHelmChart(ctx, upgradePlan, chartResource, releaseChart)
 	}
 
-	releaseVersion := chart.Annotations[upgrade.ReleaseAnnotation]
+	releaseVersion := chartResource.Annotations[upgrade.ReleaseAnnotation]
 	if releaseVersion != upgradePlan.Spec.ReleaseVersion {
 		return upgrade.ChartStateVersionAlreadyInstalled, nil
 	}
 
 	job := &batchv1.Job{}
-	if err = r.Get(ctx, types.NamespacedName{Name: chart.Status.JobName, Namespace: upgrade.HelmChartNamespace}, job); err != nil {
+	if err = r.Get(ctx, types.NamespacedName{Name: chartResource.Status.JobName, Namespace: chartResource.Namespace}, job); err != nil {
 		return upgrade.ChartStateUnknown, client.IgnoreNotFound(err)
 	}
 
@@ -276,6 +279,25 @@ func (r *UpgradePlanReconciler) upgradeHelmChart(ctx context.Context, upgradePla
 	return upgrade.ChartStateFailed, nil
 }
 
+func findChartResource(helmCharts *helmcattlev1.HelmChartList, name string) (*helmcattlev1.HelmChart, error) {
+	var charts []helmcattlev1.HelmChart
+
+	for _, chart := range helmCharts.Items {
+		if chart.Name == name {
+			charts = append(charts, chart)
+		}
+	}
+
+	switch len(charts) {
+	case 0:
+		return nil, nil
+	case 1:
+		return &charts[0], nil
+	default:
+		return nil, errMultipleHelmChartResources
+	}
+}
+
 func evaluateHelmChartState(state upgrade.HelmChartState) (setCondition setCondition, requeue bool) {
 	switch state {
 	case upgrade.ChartStateNotInstalled, upgrade.ChartStateVersionAlreadyInstalled:

internal/controller/reconcile_helm.go

@@ -2,21 +2,39 @@ package controller
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	helmcattlev1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
 	lifecyclev1alpha1 "github.com/suse-edge/upgrade-controller/api/v1alpha1"
 	"github.com/suse-edge/upgrade-controller/internal/upgrade"
 	corev1 "k8s.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
+var (
+	errMultipleHelmChartResources   = fmt.Errorf("multiple HelmChart resources found")
+	multipleHelmChartsFailureReason = "Unable to upgrade Helm release '%s' backed by multiple HelmChart resources"
+)
+
 func (r *UpgradePlanReconciler) reconcileHelmChart(ctx context.Context, upgradePlan *lifecyclev1alpha1.UpgradePlan, chart *lifecyclev1alpha1.HelmChart) (ctrl.Result, error) {
+	chartResources := &helmcattlev1.HelmChartList{}
+
+	if err := r.List(ctx, chartResources); err != nil {
+		return ctrl.Result{}, fmt.Errorf("listing HelmChart resources: %w", err)
+	}
+
 	conditionType := lifecyclev1alpha1.GetChartConditionType(chart.PrettyName)
 
 	if len(chart.DependencyCharts) != 0 {
 		for _, depChart := range chart.DependencyCharts {
-			depState, err := r.upgradeHelmChart(ctx, upgradePlan, &depChart)
+			depState, err := r.upgradeHelmChart(ctx, upgradePlan, &depChart, chartResources)
 			if err != nil {
+				if errors.Is(err, errMultipleHelmChartResources) {
+					setFailedCondition(upgradePlan, conditionType, fmt.Sprintf(multipleHelmChartsFailureReason, depChart.ReleaseName))
+					return ctrl.Result{Requeue: true}, nil
+				}
+
 				return ctrl.Result{}, err
 			}
 
@@ -29,8 +47,13 @@ func (r *UpgradePlanReconciler) reconcileHelmChart(ctx context.Context, upgradeP
 		}
 	}
 
-	coreState, err := r.upgradeHelmChart(ctx, upgradePlan, chart)
+	coreState, err := r.upgradeHelmChart(ctx, upgradePlan, chart, chartResources)
 	if err != nil {
+		if errors.Is(err, errMultipleHelmChartResources) {
+			setFailedCondition(upgradePlan, conditionType, fmt.Sprintf(multipleHelmChartsFailureReason, chart.ReleaseName))
+			return ctrl.Result{Requeue: true}, nil
+		}
+
 		return ctrl.Result{}, err
 	}
 
@@ -48,8 +71,14 @@ func (r *UpgradePlanReconciler) reconcileHelmChart(ctx context.Context, upgradeP
 
 	if len(chart.AddonCharts) != 0 {
 		for _, addonChart := range chart.AddonCharts {
-			addonState, err := r.upgradeHelmChart(ctx, upgradePlan, &addonChart)
+			addonState, err := r.upgradeHelmChart(ctx, upgradePlan, &addonChart, chartResources)
 			if err != nil {
+				if errors.Is(err, errMultipleHelmChartResources) {
+					r.Recorder.Eventf(upgradePlan, corev1.EventTypeWarning, conditionType,
+						fmt.Sprintf(multipleHelmChartsFailureReason, addonChart.ReleaseName))
+					continue
+				}
+
 				return ctrl.Result{}, err
 			}
 

internal/controller/upgradeplan_controller.go

@@ -356,7 +356,7 @@ func (r *UpgradePlanReconciler) findUpgradePlanFromJob(ctx context.Context, job
 	}
 
 	helmChart := &helmcattlev1.HelmChart{}
-	if err := r.Get(ctx, upgrade.ChartNamespacedName(chartName), helmChart); err != nil {
+	if err := r.Get(ctx, types.NamespacedName{Name: chartName, Namespace: job.GetNamespace()}, helmChart); err != nil {
 		logger := log.FromContext(ctx)
 		logger.Error(err, "failed to get helm chart")
 

internal/upgrade/helm.go

@@ -2,17 +2,8 @@ package upgrade
 
 import (
 	"fmt"
-
-	"k8s.io/apimachinery/pkg/types"
 )
 
-func ChartNamespacedName(chart string) types.NamespacedName {
-	return types.NamespacedName{
-		Name:      chart,
-		Namespace: HelmChartNamespace,
-	}
-}
-
 type HelmChartState int
 
 const (