exp: template + vap

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/error/errors.go renamed to internal/action/error/errors.go

@@ -0,0 +1,22 @@
+package action
+
+import (
+	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/release"
+
+	"github.com/operator-framework/helm-operator-plugins/pkg/client"
+)
+
+type ActionClient struct {
+	client.ActionInterface
+}
+
+func (a ActionClient) Install(name, namespace string, chrt *chart.Chart, vals map[string]interface{}, opts ...client.InstallOption) (*release.Release, error) {
+	rel, err := a.ActionInterface.Install(name, namespace, chrt, vals, opts...)
+	return rel, err
+}
+
+func (a ActionClient) Upgrade(name, namespace string, chrt *chart.Chart, vals map[string]interface{}, opts ...client.UpgradeOption) (*release.Release, error) {
+	re, err := a.ActionInterface.Upgrade(name, namespace, chrt, vals, opts...)
+	return re, err
+}

internal/error/errors_test.go renamed to internal/action/error/errors_test.go

@@ -21,7 +21,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	olmv1error "github.com/operator-framework/operator-controller/internal/action/error"
+	"gopkg.in/yaml.v3"
+	"helm.sh/helm/v3/pkg/engine"
 	"io"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"sort"
 	"strings"
 	"sync"
@@ -64,7 +68,7 @@ import (
 	"github.com/operator-framework/operator-registry/alpha/property"
 	rukpakv1alpha2 "github.com/operator-framework/rukpak/api/v1alpha2"
 	registryv1handler "github.com/operator-framework/rukpak/pkg/handler"
-	crdupgradesafety "github.com/operator-framework/rukpak/pkg/preflights/crdupgradesafety"
+	"github.com/operator-framework/rukpak/pkg/preflights/crdupgradesafety"
 	rukpaksource "github.com/operator-framework/rukpak/pkg/source"
 	"github.com/operator-framework/rukpak/pkg/storage"
 	"github.com/operator-framework/rukpak/pkg/util"
@@ -74,7 +78,6 @@ import (
 	catalogfilter "github.com/operator-framework/operator-controller/internal/catalogmetadata/filter"
 	catalogsort "github.com/operator-framework/operator-controller/internal/catalogmetadata/sort"
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
-	olmv1error "github.com/operator-framework/operator-controller/internal/error"
 	"github.com/operator-framework/operator-controller/internal/httputil"
 	"github.com/operator-framework/operator-controller/internal/labels"
 )
@@ -363,6 +366,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 			return nil
 		}, helmclient.AppendInstallPostRenderer(post))
 		if err != nil {
+			_ = r.renderTemplates(chrt, values, post)
 			log.FromContext(ctx).Error(err, "failed to install bundle")
 			setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, olmv1error.AsOlmErr(err)))
 			return ctrl.Result{}, err
@@ -799,3 +803,56 @@ func (r *ClusterExtensionReconciler) validateBundle(bundle *catalogmetadata.Bund
 
 	return nil
 }
+
+func (r *ClusterExtensionReconciler) renderTemplates(chart *chart.Chart, values map[string]interface{}, post postrender.PostRenderer) error {
+	options := chartutil.ReleaseOptions{}
+
+	// Combine chart values with release options
+	valuesToRender, err := chartutil.ToRenderValues(chart, values, options, nil)
+	if err != nil {
+		return err
+	}
+
+	// Render templates
+	rendered, err := engine.Render(chart, valuesToRender)
+	if err != nil {
+		return err
+	}
+
+	for _, tmpl := range rendered {
+		// apply post renderer
+		buf := bytes.NewBufferString(tmpl)
+		modified, err := post.Run(buf)
+		if err != nil {
+			return err
+		}
+
+		// extract object
+		var obj map[string]interface{}
+		if err := yaml.Unmarshal(modified.Bytes(), &obj); err != nil {
+			return err
+		}
+
+		resource := &unstructured.Unstructured{Object: obj}
+
+		// try to create (dry run)
+		err = r.Client.Create(context.Background(), resource, client.DryRunAll)
+		if !k8serrors.IsAlreadyExists(err) {
+			return err
+		}
+
+		key := client.ObjectKeyFromObject(resource)
+		existingResource := resource.DeepCopy()
+		err = r.Client.Get(context.Background(), key, existingResource)
+		if err != nil {
+			return err
+		}
+
+		// try to update (dry run)
+		resource.SetResourceVersion(existingResource.GetResourceVersion())
+		if err := r.Client.Update(context.Background(), resource, client.DryRunAll); !k8serrors.IsNotFound(err) {
+			return err
+		}
+	}
+	return nil
+}