Fix values merging logic by prioritizing feature values for opscenter-features if available

Fix values merging logic by prioritizing feature values for opscenter-features if available

Author: RokibulHasan7

pkg/controller/managedclustersetprofile_controller.go

@@ -123,6 +123,7 @@ func (r *ManagedClusterSetProfileReconciler) Reconcile(ctx context.Context, req
 		if len(profileBindingList.Items) > 0 {
 			profileBinding.Name = profileBindingList.Items[0].Name
 			profileBinding.Spec.OpscenterFeaturesVersion = profileBindingList.Items[0].Spec.OpscenterFeaturesVersion
+			profileBinding.Spec.Features = profileBindingList.Items[0].Spec.Features
 		}
 
 		_, err = cu.CreateOrPatch(context.Background(), r.Client, profileBinding, func(obj client.Object, createOp bool) client.Object {

pkg/feature_installer/enable_featureset.go

@@ -153,7 +153,7 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
 	}
 
 	var overrideValues map[string]interface{}
-	if overrideValues, err = InstallOpscenterFeaturesOnFakeServer(fakeServer, profile, &profileBinding.Spec.ClusterMetadata, nil); err != nil {
+	if overrideValues, err = InstallOpscenterFeaturesOnFakeServer(fakeServer, profile, profileBinding, &profileBinding.Spec.ClusterMetadata, nil); err != nil {
 		return err
 	}
 
@@ -183,7 +183,16 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
 			return err
 		}
 
-		mergedValues := values.MergeMaps(defaultValues, overrideValues)
+		var mergedValues map[string]interface{}
+		if profileBinding.Spec.Features != nil && profileBinding.Spec.Features[hub.ChartOpscenterFeatures].Values != nil {
+			err := json.Unmarshal(profileBinding.Spec.Features[hub.ChartOpscenterFeatures].Values.Raw, &mergedValues)
+			if err != nil {
+				return err
+			}
+		} else {
+			mergedValues = values.MergeMaps(defaultValues, overrideValues)
+		}
+
 		if err = CreateHelmRelease("opscenter-features", "opscenter-core", hub.BootstrapHelmRepositoryNamespace(), profile, featureObj, fakeServer, mergedValues); err != nil {
 			return err
 		}

pkg/feature_installer/opscenter_features.go

@@ -35,7 +35,7 @@ import (
 	releasesapi "x-helm.dev/apimachinery/apis/releases/v1alpha1"
 )
 
-func InstallOpscenterFeaturesOnFakeServer(fakeServer *FakeServer, profile *profilev1alpha1.ManagedClusterSetProfile, clusterMetadata *kmapi.ClusterInfo, chartRef *releasesapi.ChartSourceRef) (map[string]interface{}, error) {
+func InstallOpscenterFeaturesOnFakeServer(fakeServer *FakeServer, profile *profilev1alpha1.ManagedClusterSetProfile, profileBinding *profilev1alpha1.ManagedClusterProfileBinding, clusterMetadata *kmapi.ClusterInfo, chartRef *releasesapi.ChartSourceRef) (map[string]interface{}, error) {
 	overrides := make(map[string]interface{})
 	if profile.Spec.Features["opscenter-features"].Chart.SourceRef.Name != "" {
 		chart := profile.Spec.Features["opscenter-features"].Chart
@@ -66,6 +66,10 @@ func InstallOpscenterFeaturesOnFakeServer(fakeServer *FakeServer, profile *profi
 		return nil, err
 	}
 
+	if profileBinding != nil && profileBinding.Spec.Features != nil && profileBinding.Spec.Features["opscenter-features"].Values != nil {
+		overrideValues = profileBinding.Spec.Features["opscenter-features"].Values.Raw
+	}
+
 	if err := InstallOpscenterFeatures(overrideValues, fakeServer, chartRef); err != nil {
 		return nil, err
 	}