Fix cluster upgrade issues (#22)

Signed-off-by: RokibulHasan7 <mdrokibulhasan@appscode.com>

Author: RokibulHasan7

pkg/cluster_upgrade/upgrader.go

@@ -18,6 +18,7 @@ package cluster_upgrade
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	profilev1alpha1 "github.com/kluster-manager/cluster-profile/apis/profile/v1alpha1"
@@ -65,7 +66,14 @@ func UpgradeCluster(profileBinding *profilev1alpha1.ManagedClusterProfileBinding
 	}
 
 	var overrideValues map[string]interface{}
-	if overrideValues, err = InstallOpscenterFeaturesOnFakeServer(fakeServer, &profileBinding.Spec.ClusterMetadata, &chartRef); err != nil {
+	if profileBinding.Spec.Features == nil || profileBinding.Spec.Features[hub.ChartOpscenterFeatures].Values == nil {
+		return errors.New("no values found in profileBinding")
+	}
+	if err := json.Unmarshal(profileBinding.Spec.Features[hub.ChartOpscenterFeatures].Values.Raw, &overrideValues); err != nil {
+		return fmt.Errorf("failed to unmarshal JSON: %w", err)
+	}
+
+	if overrideValues, err = InstallOpscenterFeaturesOnFakeServer(fakeServer, overrideValues, &profileBinding.Spec.ClusterMetadata, &chartRef); err != nil {
 		return err
 	}
 

pkg/cluster_upgrade/upgrader_helper.go

@@ -99,8 +99,7 @@ func createConfigMapInSpokeClusterNamespace(kc client.Client, ver, clusterName s
 	return &cm, nil
 }
 
-func InstallOpscenterFeaturesOnFakeServer(fakeServer *feature_installer.FakeServer, clusterMetadata *kmapi.ClusterInfo, chartRef *releasesapi.ChartSourceRef) (map[string]interface{}, error) {
-	overrides := make(map[string]interface{})
+func InstallOpscenterFeaturesOnFakeServer(fakeServer *feature_installer.FakeServer, overrides map[string]interface{}, clusterMetadata *kmapi.ClusterInfo, chartRef *releasesapi.ChartSourceRef) (map[string]interface{}, error) {
 	overrides, err := feature_installer.GetOverrideValues(overrides, clusterMetadata)
 	if err != nil {
 		return nil, err

pkg/feature_installer/opscenter_features.go

@@ -68,6 +68,11 @@ func InstallOpscenterFeaturesOnFakeServer(fakeServer *FakeServer, profile *profi
 
 	if profileBinding != nil && profileBinding.Spec.Features != nil && profileBinding.Spec.Features["opscenter-features"].Values != nil {
 		overrideValues = profileBinding.Spec.Features["opscenter-features"].Values.Raw
+
+		// Unmarshal overrideValues back into overrides
+		if err := json.Unmarshal(overrideValues, &overrides); err != nil {
+			return nil, err
+		}
 	}
 
 	if err := InstallOpscenterFeatures(overrideValues, fakeServer, chartRef); err != nil {

pkg/utils/client.go

@@ -65,10 +65,10 @@ func GetNewRuntimeClient(restConfig *rest.Config) (client.Client, error) {
 	return client.New(restConfig, client.Options{
 		Scheme: scheme,
 		Mapper: mapper,
-		WarningHandler: client.WarningHandlerOptions{
-			SuppressWarnings:   true,
-			AllowDuplicateLogs: false,
-		},
+		//WarningHandler: client.WarningHandlerOptions{
+		//	SuppressWarnings:   true,
+		//	AllowDuplicateLogs: false,
+		//},
 	})
 }