Change values to be of apiextensionsv1.JSON to be generic enough to store multiple versions of values.yaml and be compatible with multiple chart versions

Author: prakashmishra1598

api/v1alpha1/virtualcluster_types.go

@@ -17,8 +17,10 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"github.com/loft-sh/vcluster/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
+
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -29,7 +31,20 @@ type VirtualClusterSpec struct {
 	Chart HelmChart `json:"chart,omitempty"`
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Schemaless
-	Values Values `json:"values,omitempty"`
+	Values *apiextensionsv1.JSON `json:"values,required"`
+}
+
+// GetValues unmarshals the raw values to a map[string]interface{} and returns
+// the result.
+func (in VirtualCluster) GetValues() (map[string]interface{}, error) {
+	var values map[string]interface{}
+	if in.Spec.Values != nil {
+		err := yaml.Unmarshal(in.Spec.Values.Raw, &values)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return values, nil
 }
 
 type HelmChart struct {
@@ -38,14 +53,6 @@ type HelmChart struct {
 	Version string `json:"version,omitempty"`
 }
 
-type Values struct {
-	config.Config `json:",inline"`
-}
-
-func (in *Values) DeepCopyInto(out *Values) {
-	*out = *in
-}
-
 // VirtualClusterStatus defines the observed state of VirtualCluster.
 type VirtualClusterStatus struct {
 	// Phase is the current phase of the VirtualCluster

api/v1alpha1/zz_generated.deepcopy.go

@@ -58,6 +58,8 @@ spec:
                 type: object
               values:
                 x-kubernetes-preserve-unknown-fields: true
+            required:
+            - values
             type: object
           status:
             description: VirtualClusterStatus defines the observed state of VirtualCluster.

config/crd/bases/core.openvc.dev_virtualclusters.yaml

@@ -1,6 +1,6 @@
 module github.com/prakashmishra1598/openvc
 
-go 1.23.2
+go 1.24
 
 require (
 	github.com/loft-sh/vcluster-config v0.0.0-20250408172738-9d5a6c680d53

go.mod

@@ -25,6 +25,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sigs.k8s.io/yaml"
 	"strings"
 
 	"github.com/xeipuuv/gojsonschema"
@@ -38,7 +39,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/yaml"
 
 	corev1alpha1 "github.com/prakashmishra1598/openvc/api/v1alpha1"
 )
@@ -301,8 +301,15 @@ func (r *VirtualClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 func (r *VirtualClusterReconciler) createValuesFile(ctx context.Context, vcluster *corev1alpha1.VirtualCluster) (string, error) {
 	logger := log.FromContext(ctx)
 
-	// Convert the values to YAML
-	valuesYAML, err := yaml.Marshal(vcluster.Spec.Values)
+	// Use the raw values directly
+	values, err := vcluster.GetValues()
+	if err != nil {
+		logger.Error(err, "Failed to get values from VirtualCluster")
+		return "", err
+	}
+
+	// convert valuesYaml to []byte
+	valuesByteArray, err := yaml.Marshal(values)
 	if err != nil {
 		logger.Error(err, "Failed to marshal values to YAML")
 		return "", err
@@ -311,7 +318,7 @@ func (r *VirtualClusterReconciler) createValuesFile(ctx context.Context, vcluste
 	// Create the values file
 	valuesFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("values-%s-%s.yaml", vcluster.Name, vcluster.Namespace))
 	logger.Info("Writing values file", "path", valuesFilePath)
-	err = os.WriteFile(valuesFilePath, valuesYAML, 0644)
+	err = os.WriteFile(valuesFilePath, valuesByteArray, 0644)
 	if err != nil {
 		logger.Error(err, "Failed to write values file")
 		return "", err
@@ -534,9 +541,10 @@ func (r *VirtualClusterReconciler) validateValuesAgainstSchema(ctx context.Conte
 	logger.Info("Validating values against schema")
 
 	// Convert the values to JSON for validation
-	valuesJSON, err := json.Marshal(vcluster.Spec.Values)
-	if err != nil {
-		return fmt.Errorf("failed to marshal values to JSON: %w", err)
+	valuesJSON := vcluster.Spec.Values.Raw
+	if valuesJSON == nil {
+		// Empty values are valid
+		return nil
 	}
 
 	// Create schema and document loaders