Handle case where IstioRevisionTag is modified to point to a revision in a different namespace

Signed-off-by: Marko Lukša <[email protected]>

Author: luksa

controllers/istiobase/istiobase_controller.go

@@ -88,43 +88,35 @@ func (r *Reconciler) Reconcile(ctx context.Context, _ reconcile.Request) (reconc
 func (r *Reconciler) doReconcile(ctx context.Context) error {
 	log := logf.FromContext(ctx)
 
+	currNamespace, err := r.findIstioBaseNamespace(ctx)
+	if err != nil {
+		return err
+	}
+
 	rev, err := r.getDefaultRevision(ctx)
 	if err != nil {
 		if errors.IsNotFound(err) {
-			if err := r.uninstallHelmChart(ctx); err != nil {
-				return fmt.Errorf("failed to uninstall base chart: %w", err)
+			if currNamespace != "" {
+				log.Info("Uninstalling Helm chart")
+				_, err := r.ChartManager.UninstallChart(ctx, baseReleaseName, currNamespace)
+				if err != nil {
+					return fmt.Errorf("failed to uninstall Helm chart %q: %w", baseChartName, err)
+				}
 			}
 			return nil
 		}
 		return fmt.Errorf("failed to reconcile: %w", err)
 	}
-	log.Info("Installing Helm chart")
-	return r.installHelmChart(ctx, rev)
-}
 
-func (r *Reconciler) getDefaultRevision(ctx context.Context) (*v1.IstioRevision, error) {
-	// 1. get the IstioRevision referenced in the default IstioRevisionTag
-	tag := v1.IstioRevisionTag{}
-	if err := r.Client.Get(ctx, types.NamespacedName{Name: "default"}, &tag); err != nil {
-		if !errors.IsNotFound(err) {
-			return nil, fmt.Errorf("failed to get default IstioRevisionTag: %w", err)
+	if rev.Spec.Namespace != currNamespace {
+		log.Info("Uninstalling Helm chart from previous namespace")
+		_, err := r.ChartManager.UninstallChart(ctx, baseReleaseName, currNamespace)
+		if err != nil {
+			return fmt.Errorf("failed to uninstall Helm chart %q: %w", baseChartName, err)
 		}
 	}
 
-	revName := tag.Status.IstioRevision
-	if revName == "" {
-		revName = "default"
-	}
-
-	// 2. get the IstioRevision
-	rev := &v1.IstioRevision{}
-	if err := r.Client.Get(ctx, types.NamespacedName{Name: revName}, rev); err != nil {
-		return rev, fmt.Errorf("failed to get IstioRevision %q: %w", revName, err)
-	}
-	return rev, nil
-}
-
-func (r *Reconciler) installHelmChart(ctx context.Context, rev *v1.IstioRevision) error {
+	log.Info("Installing Helm chart")
 	version, err := istioversion.Resolve(rev.Spec.Version)
 	if err != nil {
 		return fmt.Errorf("failed to resolve IstioRevision version for %q: %w", rev.Name, err)
@@ -142,37 +134,45 @@ func (r *Reconciler) installHelmChart(ctx context.Context, rev *v1.IstioRevision
 	return nil
 }
 
-func (r *Reconciler) getChartDir(version string) string {
-	return path.Join(r.Config.ResourceDirectory, version, "charts", baseChartName)
-}
-
-func (r *Reconciler) uninstallHelmChart(ctx context.Context) error {
-	log := logf.FromContext(ctx)
+// findIstioBaseNamespace returns the namespace the istio base chart is installed in. If the chart is not installed, it returns an empty string.
+func (r *Reconciler) findIstioBaseNamespace(ctx context.Context) (string, error) {
 	releases, err := r.ChartManager.ListReleases(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to check whether Helm chart %q is installed: %w", baseChartName, err)
+		return "", fmt.Errorf("failed to check whether Helm chart %q is installed: %w", baseChartName, err)
 	}
 
-	namespace := ""
 	for _, release := range releases {
 		if release.Name == baseReleaseName {
-			namespace = release.Namespace
-			break
+			return release.Namespace, nil
 		}
 	}
+	return "", nil
+}
 
-	if namespace == "" {
-		log.V(3).Info(fmt.Sprintf("Helm release %q not found", baseReleaseName))
-		return nil
+func (r *Reconciler) getDefaultRevision(ctx context.Context) (*v1.IstioRevision, error) {
+	// 1. get the IstioRevision referenced in the default IstioRevisionTag
+	tag := v1.IstioRevisionTag{}
+	if err := r.Client.Get(ctx, types.NamespacedName{Name: "default"}, &tag); err != nil {
+		if !errors.IsNotFound(err) {
+			return nil, fmt.Errorf("failed to get default IstioRevisionTag: %w", err)
+		}
 	}
 
-	log.V(3).Info(fmt.Sprintf("Helm release %q found in namespace %q", baseReleaseName, namespace))
-	log.Info("Uninstalling Helm chart")
-	_, err = r.ChartManager.UninstallChart(ctx, baseReleaseName, namespace)
-	if err != nil {
-		return fmt.Errorf("failed to uninstall Helm chart %q: %w", baseChartName, err)
+	revName := tag.Status.IstioRevision
+	if revName == "" {
+		revName = "default"
 	}
-	return nil
+
+	// 2. get the IstioRevision
+	rev := &v1.IstioRevision{}
+	if err := r.Client.Get(ctx, types.NamespacedName{Name: revName}, rev); err != nil {
+		return rev, fmt.Errorf("failed to get IstioRevision %q: %w", revName, err)
+	}
+	return rev, nil
+}
+
+func (r *Reconciler) getChartDir(version string) string {
+	return path.Join(r.Config.ResourceDirectory, version, "charts", baseChartName)
 }
 
 // SetupWithManager sets up the controller with the Manager.