fix: Channel spec not getting applied correctly

Author: jsbroks

controllers/weightsandbiases_controller.go

@@ -110,16 +110,17 @@ func (r *WeightsAndBiasesReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		// This can happen on first one.
 		log.Info("No active spec found.")
 	}
-	license := utils.GetLicense(crdSpec, userInputSpec)
+
+	license := utils.GetLicense(crdSpec, userInputSpec, currentActiveSpec)
 	deployerSpec, err := deployer.GetSpec(license, currentActiveSpec)
 	if err != nil {
 		log.Info("Failed to get spec from deployer", "error", err)
 	}
 
 	desiredSpec := new(spec.Spec)
 	desiredSpec.Merge(operator.Defaults(wandb, r.Scheme))
-	desiredSpec.Merge(userInputSpec)
 	desiredSpec.Merge(deployerSpec)
+	desiredSpec.Merge(userInputSpec)
 	desiredSpec.Merge(crdSpec)
 
 	log.Info("Desired spec", "spec", desiredSpec)

go.mod

@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/go-playground/validator/v10 v10.15.0
-	github.com/imdario/mergo v0.3.15
 	github.com/onsi/ginkgo/v2 v2.9.1
 	github.com/onsi/gomega v1.27.4
 	github.com/pkg/errors v0.9.1
@@ -14,7 +13,6 @@ require (
 	k8s.io/client-go v0.26.4
 	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
 	sigs.k8s.io/controller-runtime v0.14.1
-	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
@@ -73,6 +71,7 @@ require (
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -153,4 +152,5 @@ require (
 	sigs.k8s.io/kustomize/api v0.12.1 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

pkg/wandb/spec/channel/deployer/deployer.go

@@ -63,8 +63,8 @@ func GetSpec(license string, activeState *spec.Spec) (*spec.Spec, error) {
 	spec := new(spec.Spec)
 	spec.Metadata = specUnknown.Metadata
 	spec.Chart = charts.Get(specUnknown.Chart)
-	if spec.Values != nil {
-		spec.Values = *specUnknown.Values
+	if specUnknown.Values != nil {
+		spec.SetValues(*specUnknown.Values)
 	}
 
 	return spec, nil

pkg/wandb/spec/config.go

@@ -2,15 +2,13 @@ package spec
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
-	"github.com/imdario/mergo"
 	"github.com/pkg/errors"
+	"github.com/wandb/operator/pkg/utils"
 
 	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/strvals"
-	"sigs.k8s.io/yaml"
 )
 
 // Values holds an arbitrary tree-like data structure, such as parsed JSON or
@@ -172,18 +170,8 @@ func (v Values) SetValue(key string, value interface{}) error {
 // Merge uses deep copy to merge the content of another data structure. It
 // overrides the existing keys with their associated new values and copies the
 // missing keys.
-//
-// Merge can traverse nested values, it does not deep copy slices and treats
-// them as scalar values. It does not do any type checking and treats `nil`
-// values as valid values.
-//
-// It retruns an error if the underlying merge utility encounters an error.
-func (v Values) Merge(newValues Values) error {
-	if err := mergo.Merge(&v, newValues, mergo.WithOverride); err != nil {
-		return errors.Wrapf(err, "can not merge new values")
-	}
-
-	return nil
+func (v Values) Merge(newValues Values) (Values, error) {
+	return utils.MergeMapString(v.AsMap(), newValues.AsMap())
 }
 
 // Coalesce uses Helm-style coalesce to merge the content of another data
@@ -209,38 +197,3 @@ func (v Values) AddHelmValue(key, value string) error {
 
 	return nil
 }
-
-// AddFromYAML merges the values from the provided YAML.
-//
-// It will return an error if it fails to parse the YAML content or encounters
-// an error while merging. For more details see `Merge` function.
-func (v Values) AddFromYAML(content string) error {
-	return v.AddFromYAMLBuffer([]byte(content))
-}
-
-// AddFromYAMLBuffer merges the values from the provided YAML.
-//
-// It will return an error if it fails to parse the YAML content or encounters
-// an error while merging. For more details see `Merge` function.
-func (v Values) AddFromYAMLBuffer(content []byte) error {
-	newValues := Values{}
-
-	if err := yaml.Unmarshal(content, &newValues); err != nil {
-		return errors.Wrapf(err, "failed to parse yaml content")
-	}
-
-	return v.Merge(newValues)
-}
-
-// AddFromYAMLFile merges the values from the specified YAML file.
-//
-// It will return an error if it fails to read or parse the YAML file or
-// encounters an error while merging. For more details see `Merge` function.
-func (v Values) AddFromYAMLFile(filePath string) error {
-	fileContent, err := os.ReadFile(filePath)
-	if err != nil {
-		return errors.Wrapf(err, "failed to read file: %s", filePath)
-	}
-
-	return v.AddFromYAMLBuffer(fileContent)
-}

pkg/wandb/spec/spec.go

@@ -89,9 +89,11 @@ func (s *Spec) mergeConfig(values Values) (err error) {
 		s.Values = values
 		return nil
 	}
-	if err := s.Values.Merge(values); err != nil {
+	mergedValues, err := s.Values.Merge(values)
+	if err != nil {
 		return err
 	}
+	s.Values = mergedValues
 	return nil
 }
 

pkg/wandb/spec/state/secrets/secrets.go

@@ -87,8 +87,8 @@ func write(
 			Namespace: objKey.Namespace,
 		},
 		Data: map[string][]byte{
-			"chart": chartJson,
-			"values":  valuesJson,
+			"chart":  chartJson,
+			"values": valuesJson,
 		},
 	}
 	if err := controllerutil.SetControllerReference(owner, secret, scheme); err != nil {