Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HelmRelease Dependency #11

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Fix HelmRelease Dependency #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions pkg/feature_installer/enable_featureset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import (
"kubepack.dev/lib-app/pkg/handler"
"kubepack.dev/lib-helm/pkg/repo"
"kubepack.dev/lib-helm/pkg/values"
v1 "open-cluster-management.io/api/cluster/v1"
workv1 "open-cluster-management.io/api/work/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
Expand Down Expand Up @@ -120,6 +121,11 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
logger := klog.FromContext(ctx)
logger.Info(fmt.Sprintf("Profile: %s, ProfileBinding: %s, FeatureSet: %s, Features: %+v", profile.Name, profileBinding.Name, featureSet, features))

var mc v1.ManagedCluster
if err := kc.Get(context.Background(), client.ObjectKey{Name: profileBinding.Namespace}, &mc); err != nil {
return err
}

// <<<<<<<< start fake-apiserver and apply base manifestWorkReplicaSet, feature-namespace manifestWork and helm install 'opscenter-features' chart >>>>>>>
var err error
var fakeServer *FakeServer
Expand Down Expand Up @@ -186,24 +192,24 @@ func enableFeatureSet(ctx context.Context, kc client.Client, featureSet string,
return err
}

return applyFeatureSet(ctx, kc, mw, fakeServer, featureSet, []string{"kube-ui-server"}, profile)
return applyFeatureSet(ctx, kc, mw, fakeServer, featureSet, []string{"kube-ui-server"}, profile, &mc)
}
return applyFeatureSet(ctx, kc, mw, fakeServer, featureSet, features, profile)
return applyFeatureSet(ctx, kc, mw, fakeServer, featureSet, features, profile, &mc)
}

func applyFeatureSet(ctx context.Context, kc client.Client, mw *workv1.ManifestWork, fakeServer *FakeServer, featureSet string, features []string, profile *profilev1alpha1.ManagedClusterSetProfile) error {
func applyFeatureSet(ctx context.Context, kc client.Client, mw *workv1.ManifestWork, fakeServer *FakeServer, featureSet string, features []string, profile *profilev1alpha1.ManagedClusterSetProfile, mc *v1.ManagedCluster) error {
logger := klog.FromContext(ctx)
var err error
var fsObj uiapi.FeatureSet
if err = fakeServer.FakeClient.Get(ctx, types.NamespacedName{Name: featureSet}, &fsObj); err != nil {
return err
}
model, err := GetFeatureSetValues(ctx, &fsObj, features, hub.BootstrapHelmRepositoryNamespace(), fakeServer.FakeClient)
model, err := GetFeatureSetValues(ctx, &fsObj, features, hub.BootstrapHelmRepositoryNamespace(), fakeServer.FakeClient, mc)
if err != nil {
return err
}

if _, err = UpdateFeatureSetValues(ctx, fsObj.Name, fakeServer.FakeClient, model); err != nil {
if _, err = UpdateFeatureSetValues(ctx, fsObj.Name, fakeServer.FakeClient, model, mc); err != nil {
return err
}

Expand Down Expand Up @@ -363,7 +369,7 @@ func applyCRDs(restConfig *rest.Config, reg repo.IRegistry, chartRef releasesapi
return nil
}

func GetFeatureSetValues(ctx context.Context, fs *uiapi.FeatureSet, features []string, releaseNamespace string, kc client.Client) (map[string]interface{}, error) {
func GetFeatureSetValues(ctx context.Context, fs *uiapi.FeatureSet, features []string, releaseNamespace string, kc client.Client, mc *v1.ManagedCluster) (map[string]interface{}, error) {
chart, curValues, err := getFeatureSetChartRef(kc, fs, releaseNamespace)
if err != nil {
return nil, err
Expand All @@ -383,7 +389,7 @@ func GetFeatureSetValues(ctx context.Context, fs *uiapi.FeatureSet, features []s
continue
}

if err = generateHelmReleaseForFeature(kc, fs, feature, chart, curValues); err != nil {
if err = generateHelmReleaseForFeature(kc, fs, feature, chart, curValues, mc); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -505,7 +511,7 @@ func ignoreNotFoundError(err error) error {
return err
}

func generateHelmReleaseForFeature(kc client.Client, fs *uiapi.FeatureSet, feature *uiapi.Feature, chart *repo.ChartExtended, curValues map[string]interface{}) error {
func generateHelmReleaseForFeature(kc client.Client, fs *uiapi.FeatureSet, feature *uiapi.Feature, chart *repo.ChartExtended, curValues map[string]interface{}, mc *v1.ManagedCluster) error {
featureKey := getFeaturePathInValues(feature.Name)
featureDefaultValue, _, err := unstructured.NestedMap(chart.Values, "resources", featureKey)
if err != nil {
Expand All @@ -525,7 +531,7 @@ func generateHelmReleaseForFeature(kc client.Client, fs *uiapi.FeatureSet, featu
return err
}

return updateHelmReleaseDependency(context.Background(), kc, curValues, feature)
return updateHelmReleaseDependency(context.Background(), kc, curValues, feature, mc)
}

func getFeaturePathInValues(feature string) string {
Expand All @@ -541,7 +547,15 @@ func setLabelsToHelmReleases(fs *uiapi.FeatureSet, feature *uiapi.Feature, value
return unstructured.SetNestedField(values, label, "resources", featureKey, "metadata", "labels")
}

func updateHelmReleaseDependency(ctx context.Context, kc client.Client, values map[string]any, feature *uiapi.Feature) (err error) {
func updateHelmReleaseDependency(ctx context.Context, kc client.Client, values map[string]any, feature *uiapi.Feature, mc *v1.ManagedCluster) (err error) {
var featureMap *kmapi.ClusterClaimFeatures
if feature.Spec.FeatureSet != "opscenter-core" {
featureMap, err = getFeatureStatus(mc)
if err != nil {
return err
}
}

featureKey := getFeaturePathInValues(feature.Name)
if len(feature.Spec.Requirements.Features) > 0 {
dependsOn := make([]kmapi.ObjectReference, 0, len(feature.Spec.Requirements.Features))
Expand All @@ -556,14 +570,8 @@ func updateHelmReleaseDependency(ctx context.Context, kc client.Client, values m
continue
}

// if required feature enabled but not managed by UI
// don't add this feature in HelmRelease dependsOn field
status, err := calculateFeatureStatus(ctx, kc, &reqFeature)
if err != nil {
return err
}

if !status.enabled || status.managed {
if featureMap != nil && !strings.Contains(featureMap.DisabledFeatures, reqFeature.Name) &&
!strings.Contains(featureMap.ExternallyManagedFeatures, reqFeature.Name) {
dependsOn = append(dependsOn, kmapi.ObjectReference{
Name: reqFeature.Name,
})
Expand Down
8 changes: 4 additions & 4 deletions pkg/feature_installer/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func updateManifestWork(ctx context.Context, fakeServer *FakeServer, kc client.C
return nil
}

func UpdateFeatureSetValues(ctx context.Context, fs string, kc client.Client, values map[string]any) ([]string, error) {
func UpdateFeatureSetValues(ctx context.Context, fs string, kc client.Client, values map[string]any, mc *v1.ManagedCluster) ([]string, error) {
featureList, err := GetFeatures(ctx, kc, fs)
if err != nil {
return nil, err
Expand All @@ -261,7 +261,7 @@ func UpdateFeatureSetValues(ctx context.Context, fs string, kc client.Client, va
return nil, err
} else if ok {
features = append(features, feature.Name)
if err = updateHelmReleaseDependency(ctx, kc, values, &feature); err != nil {
if err = updateHelmReleaseDependency(ctx, kc, values, &feature, mc); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -318,7 +318,7 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
return nil, err
}

featuresMap, err := getFeatureStatus(mc)
featuresMap, err := getFeatureStatus(&mc)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -370,7 +370,7 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
return sanitizedFeatures, nil
}

func getFeatureStatus(cluster v1.ManagedCluster) (*kmapi.ClusterClaimFeatures, error) {
func getFeatureStatus(cluster *v1.ManagedCluster) (*kmapi.ClusterClaimFeatures, error) {
var mp kmapi.ClusterClaimFeatures
for _, claim := range cluster.Status.ClusterClaims {
if claim.Name == kmapi.ClusterClaimKeyFeatures {
Expand Down
Loading