add .spec.install.values and plumb through new conversion logic

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

api/v1alpha1/clusterextension_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
@@ -150,6 +151,27 @@ type ClusterExtensionInstallConfig struct {
 	//
 	//+optional
 	Preflight *PreflightConfig `json:"preflight,omitempty"`
+
+	// values is a map of key-value pairs that provide configuration for the
+	// installation of the package specified in the packageName field.
+	//
+	// It is an optional field.
+	//
+	// When specified, it is passed to the package manager to be used during the
+	// installation process. The package manager is responsible for interpreting
+	// the values provided in this field. The bundle that is resolved for the
+	// cluster extension may optionally provide a schema for these values. In that
+	// case, the package manager will validate the values against the schema before
+	// proceeding with the installation.
+	//
+	// When not specified, the package manager will use the default configuration
+	// of the resolved bundle.
+	//
+	//+optional
+	//+kubebuilder:pruning:PreserveUnknownFields
+	//+kubebuilder:validation:Type=object
+	//+kubebuilder:validation:Schemaless
+	Values apiextensionsv1.JSON `json:"values,omitempty"`
 }
 
 // CatalogSource defines the required fields for catalog source.

api/v1alpha1/zz_generated.deepcopy.go

@@ -179,6 +179,24 @@ spec:
                     required:
                     - name
                     type: object
+                  values:
+                    description: |-
+                      values is a map of key-value pairs that provide configuration for the
+                      installation of the package specified in the packageName field.
+
+                      It is an optional field.
+
+                      When specified, it is passed to the package manager to be used during the
+                      installation process. The package manager is responsible for interpreting
+                      the values provided in this field. The bundle that is resolved for the
+                      cluster extension may optionally provide a schema for these values. In that
+                      case, the package manager will validate the values against the schema before
+                      proceeding with the installation.
+
+                      When not specified, the package manager will use the default configuration
+                      of the resolved bundle.
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                 required:
                 - namespace
                 - serviceAccount

config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -123,6 +123,7 @@ _Appears in:_
 | `namespace` _string_ | namespace is a reference to the Namespace in which the bundle of<br />content for the package referenced in the packageName field will be applied.<br />The bundle may contain cluster-scoped resources or resources that are<br />applied to other Namespaces. This Namespace is expected to exist.<br /><br />namespace is required, immutable, and follows the DNS label standard<br />as defined in [RFC 1123]. This means that valid values:<br />  - Contain no more than 63 characters<br />  - Contain only lowercase alphanumeric characters or '-'<br />  - Start with an alphanumeric character<br />  - End with an alphanumeric character<br /><br />Some examples of valid values are:<br />  - some-namespace<br />  - 123-namespace<br />  - 1-namespace-2<br />  - somenamespace<br /><br />Some examples of invalid values are:<br />  - -some-namespace<br />  - some-namespace-<br />  - thisisareallylongnamespacenamethatisgreaterthanthemaximumlength<br />  - some.namespace<br /><br />[RFC 1123]: https://tools.ietf.org/html/rfc1123 |  | MaxLength: 63 <br />Pattern: `^[a-z0-9]([-a-z0-9]*[a-z0-9])?$` <br /> |
 | `serviceAccount` _[ServiceAccountReference](#serviceaccountreference)_ | serviceAccount is a required reference to a ServiceAccount that exists<br />in the installNamespace. The provided ServiceAccount is used to install and<br />manage the content for the package specified in the packageName field.<br /><br />In order to successfully install and manage the content for the package,<br />the ServiceAccount provided via this field should be configured with the<br />appropriate permissions to perform the necessary operations on all the<br />resources that are included in the bundle of content being applied. |  |  |
 | `preflight` _[PreflightConfig](#preflightconfig)_ | preflight is an optional field that can be used to configure the preflight checks run before installation or upgrade of the content for the package specified in the packageName field.<br /><br />When specified, it overrides the default configuration of the preflight checks that are required to execute successfully during an install/upgrade operation.<br /><br />When not specified, the default configuration for each preflight check will be used. |  |  |
+| `values` _[JSON](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#json-v1-apiextensions-k8s-io)_ | values is a map of key-value pairs that provide configuration for the<br />installation of the package specified in the packageName field.<br /><br />It is an optional field.<br /><br />When specified, it is passed to the package manager to be used during the<br />installation process. The package manager is responsible for interpreting<br />the values provided in this field. The bundle that is resolved for the<br />cluster extension may optionally provide a schema for these values. In that<br />case, the package manager will validate the values against the schema before<br />proceeding with the installation.<br /><br />When not specified, the package manager will use the default configuration<br />of the resolved bundle. |  | Schemaless: \{\} <br />Type: object <br /> |
 
 
 #### ClusterExtensionInstallStatus

docs/api-reference/operator-controller-api-reference.md

@@ -3,6 +3,7 @@ package applier
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -15,15 +16,14 @@ import (
 	"helm.sh/helm/v3/pkg/postrender"
 	"helm.sh/helm/v3/pkg/release"
 	"helm.sh/helm/v3/pkg/storage/driver"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	apimachyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/internal/rukpak/convert"
+	convert "github.com/operator-framework/operator-controller/internal/rukpak/convert/v2"
 	"github.com/operator-framework/operator-controller/internal/rukpak/preflights/crdupgradesafety"
 	"github.com/operator-framework/operator-controller/internal/rukpak/util"
 )
@@ -57,11 +57,17 @@ type Helm struct {
 }
 
 func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1alpha1.ClusterExtension, objectLabels map[string]string, storageLabels map[string]string) ([]client.Object, string, error) {
-	chrt, err := convert.RegistryV1ToHelmChart(ctx, contentFS, ext.Spec.Install.Namespace, []string{corev1.NamespaceAll})
+	chrt, err := convert.RegistryV1ToHelmChart(ctx, contentFS)
 	if err != nil {
 		return nil, "", err
 	}
+
 	values := chartutil.Values{}
+	if valuesJSON := ext.Spec.Install.Values.Raw; valuesJSON != nil {
+		if err := json.Unmarshal(valuesJSON, &values); err != nil {
+			return nil, "", err
+		}
+	}
 
 	ac, err := h.ActionClientGetter.ActionClientFor(ctx, ext)
 	if err != nil {
@@ -113,6 +119,7 @@ func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1alpha1.Clust
 		rel, err = ac.Upgrade(ext.GetName(), ext.Spec.Install.Namespace, chrt, values, func(upgrade *action.Upgrade) error {
 			upgrade.MaxHistory = maxHelmReleaseHistory
 			upgrade.Labels = storageLabels
+			upgrade.ResetValues = true
 			return nil
 		}, helmclient.AppendUpgradePostRenderer(post))
 		if err != nil {
@@ -158,6 +165,7 @@ func (h *Helm) getReleaseState(cl helmclient.ActionInterface, ext *ocv1alpha1.Cl
 		upgrade.MaxHistory = maxHelmReleaseHistory
 		upgrade.DryRun = true
 		upgrade.DryRunOption = "server"
+		upgrade.ResetValues = true
 		return nil
 	}, helmclient.AppendUpgradePostRenderer(post))
 	if err != nil {