Skip to content

✨ use clusteradm instead of custom code for labeling, ns creation #58

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

✨ use clusteradm instead of custom code for labeling, ns creation #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237630f
feat: use clusteradm instead of custom code for labeling, ns creation
arturshadnik Aug 27, 2025
0e99074
chore: bump fcc to 0.0.13
arturshadnik Aug 27, 2025
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
2 changes: 1 addition & 1 deletion fleetconfig-controller/charts/fleetconfig-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Resource specifications for all klusterlet-managed containers.
| `replicas` | fleetconfig-controller replica count | `1` |
| `imageRegistry` | Image registry | `""` |
| `image.repository` | Image repository | `quay.io/open-cluster-management/fleetconfig-controller` |
| `image.tag` | Image tag | `v0.0.12` |
| `image.tag` | Image tag | `v0.0.13` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Image pull secrets | `[]` |
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
Expand Down
2 changes: 1 addition & 1 deletion fleetconfig-controller/charts/fleetconfig-controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ imageRegistry: ""
## @param image.pullPolicy Image pull policy
image:
repository: quay.io/open-cluster-management/fleetconfig-controller
tag: v0.0.12
tag: v0.0.13
pullPolicy: IfNotPresent

## @param imagePullSecrets Image pull secrets
Expand Down
164 changes: 22 additions & 142 deletions fleetconfig-controller/internal/controller/v1alpha1/addon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package v1alpha1

import (
"context"
"encoding/json"
"fmt"
"maps"
"net/url"
"os/exec"
"slices"
Expand Down Expand Up @@ -35,12 +33,6 @@ const (
install = "install"
uninstall = "uninstall"
hubAddon = "hub-addon"

// accepetd hub addon names
hubAddOnArgoCD = "argocd"
hubAddOnGPF = "governance-policy-framework"

argocdNamespace = "argocd"
)

func handleAddonConfig(ctx context.Context, kClient client.Client, addonC *addonapi.Clientset, fc *v1alpha1.FleetConfig) error {
Expand Down Expand Up @@ -94,15 +86,15 @@ func handleAddonConfig(ctx context.Context, kClient client.Client, addonC *addon
return err
}

err = handleAddonCreate(ctx, kClient, addonC, fc, addonsToCreate)
err = handleAddonCreate(ctx, kClient, fc, addonsToCreate)
if err != nil {
return err
}

return nil
}

func handleAddonCreate(ctx context.Context, kClient client.Client, addonC *addonapi.Clientset, fc *v1alpha1.FleetConfig, addons []v1alpha1.AddOnConfig) error {
func handleAddonCreate(ctx context.Context, kClient client.Client, fc *v1alpha1.FleetConfig, addons []v1alpha1.AddOnConfig) error {
if len(addons) == 0 {
return nil
}
Expand All @@ -125,6 +117,7 @@ func handleAddonCreate(ctx context.Context, kClient client.Client, addonC *addon
create,
a.Name,
fmt.Sprintf("--version=%s", a.Version),
fmt.Sprintf("--labels=%v", v1alpha1.ManagedBySelector.String()),
}, fc.BaseArgs()...)

// Extract manifest configuration from ConfigMap
Expand Down Expand Up @@ -173,70 +166,10 @@ func handleAddonCreate(ctx context.Context, kClient client.Client, addonC *addon
return fmt.Errorf("failed to create addon: %v, output: %s", err, string(out))
}
logger.V(0).Info("created addon", "AddOnTemplate", a.Name, "output", string(stdout))

// label created resources
err = labelConfigurationResources(ctx, addonC, a)
if err != nil {
logger.V(0).Error(err, "failed to label addon resources", "addon", a.Name, "version", a.Version)
}
}
return nil
}

// labelConfigurationResources labels the AddOnTemplate and ClusterManagementAddOn resources created for an addon
func labelConfigurationResources(ctx context.Context, addonC *addonapi.Clientset, addon v1alpha1.AddOnConfig) error {
logger := log.FromContext(ctx)

// Label AddOnTemplate with a.Name-a.Version
addonTemplateName := fmt.Sprintf("%s-%s", addon.Name, addon.Version)
addonTemplate, err := addonC.AddonV1alpha1().AddOnTemplates().Get(ctx, addonTemplateName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get AddOnTemplate %s: %v", addonTemplateName, err)
}

// Add managedBy label to AddOnTemplate
if addonTemplate.Labels == nil {
addonTemplate.Labels = make(map[string]string)
}
maps.Copy(addonTemplate.Labels, v1alpha1.ManagedByLabels)

patchBytes, err := json.Marshal(labelPatchData(addonTemplate.Labels))
if err != nil {
return fmt.Errorf("failed to marshal patch data for AddOnTemplate %s: %v", addonTemplateName, err)
}

_, err = addonC.AddonV1alpha1().AddOnTemplates().Patch(ctx, addonTemplate.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
if err != nil {
return fmt.Errorf("failed to update AddOnTemplate %s with labels: %v", addonTemplateName, err)
}
logger.V(2).Info("labeled AddOnTemplate", "name", addonTemplateName, "label", v1alpha1.LabelAddOnManagedBy)

// Label ClusterManagementAddOn with a.Name
clusterMgmtAddOn, err := addonC.AddonV1alpha1().ClusterManagementAddOns().Get(ctx, addon.Name, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get ClusterManagementAddOn %s: %v", addon.Name, err)
}

// Add managedBy label to ClusterManagementAddOn
if clusterMgmtAddOn.Labels == nil {
clusterMgmtAddOn.Labels = make(map[string]string)
}
maps.Copy(clusterMgmtAddOn.Labels, v1alpha1.ManagedByLabels)

patchBytes, err = json.Marshal(labelPatchData(clusterMgmtAddOn.Labels))
if err != nil {
return fmt.Errorf("failed to marshal patch data for ClusterManagementAddOn %s: %v", addon.Name, err)
}

_, err = addonC.AddonV1alpha1().ClusterManagementAddOns().Patch(ctx, clusterMgmtAddOn.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
if err != nil {
return fmt.Errorf("failed to update ClusterManagementAddOn %s with labels: %v", addon.Name, err)
}
logger.V(2).Info("labeled ClusterManagementAddOn", "name", addon.Name, "label", v1alpha1.LabelAddOnManagedBy)

return nil
}

func handleAddonDelete(ctx context.Context, addonC *addonapi.Clientset, fc *v1alpha1.FleetConfig, addons []string) error {
if len(addons) == 0 {
return nil
Expand Down Expand Up @@ -307,7 +240,7 @@ func handleAddonDelete(ctx context.Context, addonC *addonapi.Clientset, fc *v1al
return nil
}

func handleSpokeAddons(ctx context.Context, addonC *addonapi.Clientset, spoke v1alpha1.Spoke, fc *v1alpha1.FleetConfig) ([]string, error) {
func handleSpokeAddons(ctx context.Context, spoke v1alpha1.Spoke, fc *v1alpha1.FleetConfig) ([]string, error) {
var enabledAddons []string

addons := spoke.AddOns
Expand Down Expand Up @@ -357,7 +290,7 @@ func handleSpokeAddons(ctx context.Context, addonC *addonapi.Clientset, spoke v1
}

// do disables first, then enables/updates
err := handleAddonDisable(ctx, spoke.Name, addonsToDisable)
err := handleAddonDisable(ctx, spoke.Name, addonsToDisable, fc)
if err != nil {
return enabledAddons, err
}
Expand All @@ -370,7 +303,7 @@ func handleSpokeAddons(ctx context.Context, addonC *addonapi.Clientset, spoke v1
}

// Enable new addons and updated addons
newEnabledAddons, err := handleAddonEnable(ctx, addonC, spoke.Name, addonsToEnable)
newEnabledAddons, err := handleAddonEnable(ctx, spoke.Name, addonsToEnable, fc)
// even if an error is returned, any addon which was successfully enabled is tracked, so append before returning
enabledAddons = append(enabledAddons, newEnabledAddons...)
if err != nil {
Expand All @@ -380,19 +313,20 @@ func handleSpokeAddons(ctx context.Context, addonC *addonapi.Clientset, spoke v1
return enabledAddons, nil
}

func handleAddonEnable(ctx context.Context, addonC *addonapi.Clientset, spokeName string, addons []v1alpha1.AddOn) ([]string, error) {
func handleAddonEnable(ctx context.Context, spokeName string, addons []v1alpha1.AddOn, fc *v1alpha1.FleetConfig) ([]string, error) {
if len(addons) == 0 {
return nil, nil
}

logger := log.FromContext(ctx)
logger.V(0).Info("enableAddOns", "managedcluster", spokeName)

baseArgs := []string{
baseArgs := append([]string{
addon,
enable,
fmt.Sprintf("--cluster=%s", spokeName),
}
fmt.Sprintf("--labels=%v", v1alpha1.ManagedBySelector.String()),
}, fc.BaseArgs()...)

var enableErrs []error
enabledAddons := make([]string, 0)
Expand All @@ -419,11 +353,6 @@ func handleAddonEnable(ctx context.Context, addonC *addonapi.Clientset, spokeNam
enableErrs = append(enableErrs, fmt.Errorf("failed to enable addon: %v, output: %s", err, string(out)))
continue
}
err = labelManagedClusterAddOn(ctx, addonC, spokeName, a.ConfigName)
if err != nil {
enableErrs = append(enableErrs, err)
continue
}
enabledAddons = append(enabledAddons, a.ConfigName)
logger.V(1).Info("enabled addon", "managedcluster", spokeName, "addon", a.ConfigName, "output", string(stdout))
}
Expand All @@ -434,47 +363,20 @@ func handleAddonEnable(ctx context.Context, addonC *addonapi.Clientset, spokeNam
return enabledAddons, nil
}

func labelManagedClusterAddOn(ctx context.Context, addonC *addonapi.Clientset, spokeName, addonName string) error {
logger := log.FromContext(ctx)

mcao, err := addonC.AddonV1alpha1().ManagedClusterAddOns(spokeName).Get(ctx, addonName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get ManagedClusterAddOn %s for spoke %s: %v", addonName, spokeName, err)
}

if mcao.Labels == nil {
mcao.Labels = make(map[string]string)
}
maps.Copy(mcao.Labels, v1alpha1.ManagedByLabels)

patchBytes, err := json.Marshal(labelPatchData(mcao.Labels))
if err != nil {
return fmt.Errorf("failed to marshal patch data for ManagedClusterAddOn %s: %v", addonName, err)
}

_, err = addonC.AddonV1alpha1().ManagedClusterAddOns(spokeName).Patch(ctx, mcao.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
if err != nil {
return fmt.Errorf("failed to update ManagedClusterAddOn %s for spoke %s with labels: %v", addonName, spokeName, err)
}
logger.V(2).Info("labeled ManagedClusterAddOn", "name", addonName, "spoke", spokeName, "label", v1alpha1.LabelAddOnManagedBy)

return nil
}

func handleAddonDisable(ctx context.Context, spokeName string, addons []string) error {
func handleAddonDisable(ctx context.Context, spokeName string, addons []string, fc *v1alpha1.FleetConfig) error {
if len(addons) == 0 {
return nil
}

logger := log.FromContext(ctx)
logger.V(0).Info("disableAddOns", "managedcluster", spokeName)

args := []string{
args := append([]string{
addon,
disable,
fmt.Sprintf("--names=%s", strings.Join(addons, ",")),
fmt.Sprintf("--clusters=%s", spokeName),
}
}, fc.BaseArgs()...)

logger.V(7).Info("running", "command", clusteradm, "args", args)
cmd := exec.Command(clusteradm, args...)
Expand Down Expand Up @@ -506,7 +408,7 @@ func isHubAddOnMatching(installed v1alpha1.InstalledHubAddOn, desired v1alpha1.H
installed.BundleVersion == bundleVersion
}

func handleHubAddons(ctx context.Context, kClient client.Client, addonC *addonapi.Clientset, fc *v1alpha1.FleetConfig) error {
func handleHubAddons(ctx context.Context, addonC *addonapi.Clientset, fc *v1alpha1.FleetConfig) error {
logger := log.FromContext(ctx)
logger.V(0).Info("handleHubAddons", "fleetconfig", fc.Name)

Expand Down Expand Up @@ -543,12 +445,12 @@ func handleHubAddons(ctx context.Context, kClient client.Client, addonC *addonap
}

// do uninstalls first, then installs
err := handleHubAddonUninstall(ctx, addonsToUninstall)
err := handleHubAddonUninstall(ctx, addonsToUninstall, fc)
if err != nil {
return err
}

err = handleHubAddonInstall(ctx, kClient, addonC, addonsToInstall, bundleVersion)
err = handleHubAddonInstall(ctx, addonC, addonsToInstall, bundleVersion, fc)
if err != nil {
return err
}
Expand All @@ -566,7 +468,7 @@ func handleHubAddons(ctx context.Context, kClient client.Client, addonC *addonap
return nil
}

func handleHubAddonUninstall(ctx context.Context, addons []v1alpha1.InstalledHubAddOn) error {
func handleHubAddonUninstall(ctx context.Context, addons []v1alpha1.InstalledHubAddOn, fc *v1alpha1.FleetConfig) error {
if len(addons) == 0 {
return nil
}
Expand All @@ -576,11 +478,11 @@ func handleHubAddonUninstall(ctx context.Context, addons []v1alpha1.InstalledHub

var errs []error
for _, addon := range addons {
args := []string{
args := append([]string{
uninstall,
hubAddon,
fmt.Sprintf("--names=%s", addon.Name),
}
}, fc.BaseArgs()...)
if addon.Namespace != "" {
args = append(args, fmt.Sprintf("--namespace=%s", addon.Namespace))
}
Expand All @@ -603,7 +505,7 @@ func handleHubAddonUninstall(ctx context.Context, addons []v1alpha1.InstalledHub
return nil
}

func handleHubAddonInstall(ctx context.Context, kClient client.Client, addonC *addonapi.Clientset, addons []v1alpha1.HubAddOn, bundleVersion string) error {
func handleHubAddonInstall(ctx context.Context, addonC *addonapi.Clientset, addons []v1alpha1.HubAddOn, bundleVersion string, fc *v1alpha1.FleetConfig) error {
if len(addons) == 0 {
return nil
}
Expand All @@ -624,27 +526,13 @@ func handleHubAddonInstall(ctx context.Context, kClient client.Client, addonC *a
continue
}

// workaround until https://github.com/open-cluster-management-io/clusteradm/pull/510 is merged/released
if addon.Name == hubAddOnArgoCD && addon.CreateNamespace {
ns := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: argocdNamespace,
},
}
err := kClient.Create(ctx, ns)
if err != nil && !kerrs.IsAlreadyExists(err) {
errs = append(errs, fmt.Errorf("failed to create namespace for hubAddon %s: %v", addon.Name, err))
continue
}
}

args := []string{
args := append([]string{
install,
hubAddon,
fmt.Sprintf("--names=%s", addon.Name),
fmt.Sprintf("--bundle-version=%s", bundleVersion),
fmt.Sprintf("--create-namespace=%t", addon.CreateNamespace),
}
}, fc.BaseArgs()...)
if addon.InstallNamespace != "" {
args = append(args, fmt.Sprintf("--namespace=%s", addon.InstallNamespace))
}
Expand Down Expand Up @@ -676,11 +564,3 @@ func isAddonInstalled(ctx context.Context, addonC *addonapi.Clientset, addonName
// so if the addon is found here, we can assume it was previously installed by `install hub-addon`
return true, nil
}

func labelPatchData(labels map[string]string) map[string]any {
return map[string]any{
"metadata": map[string]any{
"labels": labels,
},
}
}
2 changes: 1 addition & 1 deletion fleetconfig-controller/internal/controller/v1alpha1/hub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func handleHub(ctx context.Context, kClient client.Client, fc *v1alpha1.FleetCon
return err
}

err = handleHubAddons(ctx, kClient, addonC, fc)
err = handleHubAddons(ctx, addonC, fc)
if err != nil {
fc.SetConditions(true, v1alpha1.NewCondition(
err.Error(), v1alpha1.FleetConfigAddonsConfigured, metav1.ConditionFalse, metav1.ConditionTrue,
Expand Down
8 changes: 2 additions & 6 deletions fleetconfig-controller/internal/controller/v1alpha1/spoke.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ func handleSpokes(ctx context.Context, kClient client.Client, fc *v1alpha1.Fleet
if err != nil {
return err
}
addonClient, err := common.AddOnClient(hubKubeconfig)
if err != nil {
return err
}

// clean up deregistered spokes
joinedSpokes := make([]v1alpha1.JoinedSpoke, 0)
Expand Down Expand Up @@ -179,7 +175,7 @@ func handleSpokes(ctx context.Context, kClient client.Client, fc *v1alpha1.Fleet
}
}

enabledAddons, err := handleSpokeAddons(ctx, addonClient, spoke, fc)
enabledAddons, err := handleSpokeAddons(ctx, spoke, fc)
if err != nil {
msg := fmt.Sprintf("failed to enable addons for spoke cluster %s: %s", spoke.Name, err.Error())
fc.SetConditions(true, v1alpha1.NewCondition(
Expand Down Expand Up @@ -633,7 +629,7 @@ func deregisterSpoke(ctx context.Context, kClient client.Client, hubKubeconfig [
}

// remove addons only after confirming that the cluster can be unjoined - this avoids leaving dangling resources that may rely on the addon
if err := handleAddonDisable(ctx, spoke.Name, spoke.EnabledAddons); err != nil {
if err := handleAddonDisable(ctx, spoke.Name, spoke.EnabledAddons, fc); err != nil {
fc.SetConditions(true, v1alpha1.NewCondition(
err.Error(), spoke.AddonDisableType(), metav1.ConditionFalse, metav1.ConditionTrue,
))
Expand Down
Loading