Fix manifestwork label and feature installation issue (#24)

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

Author: RokibulHasan7

pkg/common/constants.go

@@ -19,7 +19,6 @@ package common
 const (
 	ClusterClaimClusterInfo = "cluster.ace.info"
 	LabelAceFeatureSet      = "featureset.appscode.com/managed"
-	ProfileLabel            = "profile.appscode.com/name"
 
 	ACEUpgrader        = "ace.cloud.com/upgrader"
 	ACEUpgraderVersion = "ace.cloud.com/version"

pkg/controller/managedclustersetprofile_controller.go

@@ -20,13 +20,13 @@ import (
 	"context"
 
 	profilev1alpha1 "github.com/kluster-manager/cluster-profile/apis/profile/v1alpha1"
-	"github.com/kluster-manager/cluster-profile/pkg/common"
 
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	kmapi "kmodules.xyz/client-go/api/v1"
 	cu "kmodules.xyz/client-go/client"
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
 	clusterv1beta2 "open-cluster-management.io/api/cluster/v1beta2"
@@ -100,7 +100,7 @@ func (r *ManagedClusterSetProfileReconciler) Reconcile(ctx context.Context, req
 				Name:      cluster.Name,
 				Namespace: cluster.Name,
 				Labels: map[string]string{
-					common.ProfileLabel: profile.Name,
+					kmapi.ClusterProfileLabel: profile.Name,
 				},
 				OwnerReferences: []metav1.OwnerReference{
 					*metav1.NewControllerRef(profile, profilev1alpha1.SchemeGroupVersion.WithKind(profilev1alpha1.ResourceKindManagedClusterSetProfile)),

pkg/feature_installer/enable_featureset.go

@@ -139,7 +139,7 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
 			Namespace: profileBinding.Namespace,
 			Labels: map[string]string{
 				common.LabelAceFeatureSet: "true",
-				common.ProfileLabel:       profile.Name,
+				kmapi.ClusterProfileLabel: profile.Name,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				*metav1.NewControllerRef(profileBinding, profilev1alpha1.SchemeGroupVersion.WithKind(profilev1alpha1.ResourceKindManagedClusterProfileBinding)),
@@ -282,7 +282,7 @@ func applyFeatureSet(ctx context.Context, kc client.Client, mw *workv1.ManifestW
 		return err
 	}
 
-	if err = updateManifestWork(ctx, fakeServer, kc, mw); err != nil {
+	if err = updateManifestWork(ctx, fakeServer, kc, mw, profile); err != nil {
 		return err
 	}
 	return nil

pkg/feature_installer/helpers.go

@@ -21,8 +21,11 @@ import (
 	pkgerr "errors"
 	"fmt"
 	"net/http"
+	"sort"
 	"time"
 
+	profilev1alpha1 "github.com/kluster-manager/cluster-profile/apis/profile/v1alpha1"
+	"github.com/kluster-manager/cluster-profile/pkg/common"
 	"github.com/kluster-manager/cluster-profile/pkg/utils"
 
 	fluxhelm "github.com/fluxcd/helm-controller/api/v2"
@@ -203,7 +206,7 @@ func waitForReleaseToBeCreated(kc client.Client, name []string) error {
 	})
 }
 
-func updateManifestWork(ctx context.Context, fakeServer *FakeServer, kc client.Client, mw *workv1.ManifestWork) error {
+func updateManifestWork(ctx context.Context, fakeServer *FakeServer, kc client.Client, mw *workv1.ManifestWork, profile *profilev1alpha1.ManagedClusterSetProfile) error {
 	logger := log.FromContext(ctx)
 	// fake-apiserver shutdown
 	if err := fakeServer.FakeSrv.Shutdown(ctx); err != nil {
@@ -265,6 +268,11 @@ func updateManifestWork(ctx context.Context, fakeServer *FakeServer, kc client.C
 	mw.Spec.ManifestConfigs = configOptions
 	_, err := cu.CreateOrPatch(ctx, kc, mw, func(obj client.Object, createOp bool) client.Object {
 		in := obj.(*workv1.ManifestWork)
+		if in.Labels == nil {
+			in.Labels = map[string]string{}
+		}
+		in.Labels[kmapi.ClusterProfileLabel] = profile.Name
+		in.Labels[common.LabelAceFeatureSet] = "true"
 		in.Spec = mw.Spec
 		return in
 	})
@@ -356,9 +364,7 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
 		return nil, err
 	}
 
-	featureExclusionTracker := make(map[string]bool)    // Tracks if an exclusion group already has an enabled feature
 	exclusionGroupFeatures := make(map[string][]string) // Tracks features by their exclusion group
-
 	var featureList uiapi.FeatureList
 	if err = kc.List(context.Background(), &featureList); err != nil {
 		return nil, err
@@ -368,28 +374,31 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
 		if exclusionGroup != "" {
 			// Mark the exclusion group as having an enabled feature if this feature is enabled
 			if strings.Contains(featuresMap.EnabledFeatures, f.Name) {
-				featureExclusionTracker[exclusionGroup] = true
 				exclusionGroupFeatures[exclusionGroup] = append(exclusionGroupFeatures[exclusionGroup], f.Name)
 			}
 		}
 	}
 
+	sort.Strings(features)
 	var sanitizedFeatures []string
 	for _, f := range features {
 		var feature uiapi.Feature
 		if err := kc.Get(context.Background(), types.NamespacedName{Name: f}, &feature); err != nil {
 			return nil, err
 		}
 
+		if strings.Contains(featuresMap.ExternallyManagedFeatures, f) || strings.Contains(featuresMap.DisabledFeatures, f) {
+			continue
+		}
+
 		exclusionGroup := feature.Spec.FeatureExclusionGroup
 		// Skip if an exclusion group already has an enabled feature or features are already present
-		if exclusionGroup != "" {
-			if featureExclusionTracker[exclusionGroup] || len(exclusionGroupFeatures[exclusionGroup]) > 0 {
-				continue
-			}
+		exist, err := existInManifestWork(kc, clusterName, feature.Spec.FeatureSet, feature.Name)
+		if err != nil {
+			return nil, err
 		}
 
-		if strings.Contains(featuresMap.ExternallyManagedFeatures, f) || strings.Contains(featuresMap.DisabledFeatures, f) {
+		if exclusionGroup != "" && len(exclusionGroupFeatures[exclusionGroup]) > 0 && !exist {
 			continue
 		}
 
@@ -417,3 +426,22 @@ func getFeatureStatus(cluster *v1.ManagedCluster) (*kmapi.ClusterClaimFeatures,
 
 	return nil, pkgerr.New("features cluster claim not found")
 }
+
+func existInManifestWork(kc client.Client, clusterName, fSetName, featureName string) (bool, error) {
+	var mw workv1.ManifestWork
+	err := kc.Get(context.Background(), client.ObjectKey{Name: fSetName, Namespace: clusterName}, &mw)
+	if err != nil && !errors.IsNotFound(err) {
+		return false, err
+	}
+
+	for _, m := range mw.Spec.Workload.Manifests {
+		hr := fluxhelm.HelmRelease{}
+		if err = utils.Copy(m, &hr); err != nil {
+			return false, err
+		}
+		if hr.Name == featureName {
+			return true, nil
+		}
+	}
+	return false, nil
+}