Add --config-file flag to addon enable command (#512)

This commit implements the feature requested in issue #501 by adding
a --config-file flag to the addon enable command. The flag allows
users to specify addon configurations that will be applied to the
cluster and referenced in the ManagedClusterAddOn resource.

Changes:
- Added ConfigFile field to Options struct
- Added --config-file flag to the enable command
- Implemented applyConfigFileAndBuildReferences() function that:
  - Reads configuration resources from a YAML file
  - Applies the resources to the cluster using ResourceReader
  - Uses REST mapper to discover GVR (Group/Version/Resource)
  - Builds AddOnConfig references with proper group, resource,
    namespace, and name
- Updated NewClusterAddonInfo() to accept configs as a parameter
- Updated runWithClient() to apply config file before creating addons
- Updated ApplyAddon() to handle configs when updating existing addons
- Added comprehensive integration tests for the new functionality
- Added TestClientGetter helper for test setup

The config file should contain actual Kubernetes resources (e.g.,
AddOnDeploymentConfig) in YAML format. Multiple resources can be
separated by '---'. The implementation automatically discovers the
resource type and builds proper references that are set in the
ManagedClusterAddOn.Spec.Configs field.

Example usage:
  clusteradm addon enable --names my-addon --clusters cluster1 \
    --config-file addon-config.yaml

Fixes #501

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Jian Qiu <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: qiujian16

pkg/cmd/addon/disable/exec_test.go

@@ -60,7 +60,7 @@ var _ = ginkgo.Describe("addon disable", func() {
 			for _, clus := range clusters {
 				ginkgo.By(fmt.Sprintf("Enabling %s addon on %s cluster in %s namespace", addon, clus, ns))
 
-				cai, err := enable.NewClusterAddonInfo(clus, o, addon)
+				cai, err := enable.NewClusterAddonInfo(clus, o, addon, nil)
 				gomega.Expect(err).ToNot(gomega.HaveOccurred(), "enable addon error")
 				err = enable.ApplyAddon(addonClient, cai)
 				gomega.Expect(err).ToNot(gomega.HaveOccurred(), "enable addon error")

pkg/cmd/addon/enable/cmd.go

@@ -32,6 +32,11 @@ var example = `
 %[1]s addon enable --names config-policy-controller --namespace namespace --clusters cluster1,cluster2
 # Enable config-policy-controller addon for specified clusters
 %[1]s addon enable --names config-policy-controller --clusters cluster1,cluster2
+
+## With Configuration File
+
+# Enable addon with configurations from a file
+%[1]s addon enable --names my-addon --clusters cluster1 --config-file addon-config.yaml
 `
 
 // NewCmd...
@@ -70,6 +75,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	cmd.Flags().StringVar(&o.OutputFile, "output-file", "", "The generated resources will be copied in the specified file")
 	cmd.Flags().StringSliceVar(&o.Annotate, "annotate", []string{}, "Annotations to add to the ManagedClusterAddon (eg. key1=value1,key2=value2)")
 	cmd.Flags().StringSliceVar(&o.Labels, "labels", []string{}, "Labels to add to the ManagedClusterAddon (eg. key1=value1,key2=value2)")
+	cmd.Flags().StringVar(&o.ConfigFile, "config-file", "", "Path to the configuration file containing addon configs (YAML format with group, resource, namespace, and name)")
 
 	return cmd
 }

pkg/cmd/addon/enable/exec.go

@@ -2,14 +2,21 @@
 package enable
 
 import (
+	"bufio"
+	"bytes"
 	"context"
 	"fmt"
+	"io"
+	"open-cluster-management.io/clusteradm/pkg/helpers/reader"
+	"os"
 	"strings"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/klog/v2"
 	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	addonclientset "open-cluster-management.io/api/client/addon/clientset/versioned"
@@ -24,7 +31,95 @@ type ClusterAddonInfo struct {
 	Annotations map[string]string
 }
 
-func NewClusterAddonInfo(cn string, o *Options, an string) (*addonv1alpha1.ManagedClusterAddOn, error) {
+// applyConfigFileAndBuildReferences reads the config file, applies the resources to the cluster,
+// and builds AddOnConfig references from the applied resources
+func applyConfigFileAndBuildReferences(o *Options) ([]addonv1alpha1.AddOnConfig, error) {
+	if o.ConfigFile == "" {
+		return nil, nil
+	}
+
+	// Read the config file
+	data, err := os.ReadFile(o.ConfigFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file %s: %w", o.ConfigFile, err)
+	}
+
+	yamlReader := yaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(data)))
+	var rawResources [][]byte
+
+	for {
+		doc, err := yamlReader.Read()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, fmt.Errorf("failed to parse config file %s: %w", o.ConfigFile, err)
+		}
+		if len(bytes.TrimSpace(doc)) == 0 {
+			continue
+		}
+		rawResources = append(rawResources, doc)
+	}
+
+	if len(rawResources) == 0 {
+		return nil, nil
+	}
+
+	// Apply the resources to the cluster using ResourceReader
+	r := reader.NewResourceReader(o.ClusteradmFlags.KubectlFactory, o.ClusteradmFlags.DryRun, o.Streams)
+	if err := r.ApplyRaw(rawResources); err != nil {
+		return nil, fmt.Errorf("failed to apply config resources: %w", err)
+	}
+
+	// Parse each applied resource to build AddOnConfig references
+	var configs []addonv1alpha1.AddOnConfig
+	restMapper, err := o.ClusteradmFlags.KubectlFactory.ToRESTMapper()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get REST mapper: %w", err)
+	}
+
+	for _, rawResource := range rawResources {
+		// Decode the YAML to unstructured object
+		obj := &unstructured.Unstructured{}
+		decoder := yaml.NewYAMLOrJSONDecoder(strings.NewReader(string(rawResource)), 4096)
+		if err := decoder.Decode(obj); err != nil {
+			klog.Warningf("failed to decode resource: %v", err)
+			continue
+		}
+
+		if obj.GetKind() == "" {
+			continue
+		}
+
+		// Get the GVK from the object
+		gvk := obj.GroupVersionKind()
+
+		// Use REST mapper to get the resource name (plural form)
+		mapping, err := restMapper.RESTMapping(gvk.GroupKind(), gvk.Version)
+		if err != nil {
+			klog.Warningf("failed to get REST mapping for %s: %v", gvk.String(), err)
+			continue
+		}
+
+		// Build AddOnConfig
+		config := addonv1alpha1.AddOnConfig{
+			ConfigGroupResource: addonv1alpha1.ConfigGroupResource{
+				Group:    gvk.Group,
+				Resource: mapping.Resource.Resource,
+			},
+			ConfigReferent: addonv1alpha1.ConfigReferent{
+				Namespace: obj.GetNamespace(),
+				Name:      obj.GetName(),
+			},
+		}
+
+		configs = append(configs, config)
+	}
+
+	return configs, nil
+}
+
+func NewClusterAddonInfo(cn string, o *Options, an string, configs []addonv1alpha1.AddOnConfig) (*addonv1alpha1.ManagedClusterAddOn, error) {
 	// Parse provided annotations
 	annos := map[string]string{}
 	for _, annoString := range o.Annotate {
@@ -51,6 +146,7 @@ func NewClusterAddonInfo(cn string, o *Options, an string) (*addonv1alpha1.Manag
 		},
 		Spec: addonv1alpha1.ManagedClusterAddOnSpec{
 			InstallNamespace: o.Namespace,
+			Configs:          configs,
 		},
 	}, nil
 }
@@ -115,6 +211,12 @@ func (o *Options) runWithClient(clusterClient clusterclientset.Interface,
 		}
 	}
 
+	// Apply config file and build AddOnConfig references once for all addons
+	configs, err := applyConfigFileAndBuildReferences(o)
+	if err != nil {
+		return err
+	}
+
 	for _, addon := range addons {
 		_, err := addonClient.AddonV1alpha1().ClusterManagementAddOns().Get(context.TODO(), addon, metav1.GetOptions{})
 		if err != nil {
@@ -125,7 +227,7 @@ func (o *Options) runWithClient(clusterClient clusterclientset.Interface,
 		}
 
 		for _, clusterName := range clusters {
-			cai, err := NewClusterAddonInfo(clusterName, o, addon)
+			cai, err := NewClusterAddonInfo(clusterName, o, addon, configs)
 			if err != nil {
 				return err
 			}
@@ -155,6 +257,9 @@ func ApplyAddon(addonClient addonclientset.Interface, addon *addonv1alpha1.Manag
 	originalAddon.Annotations = addon.Annotations
 	originalAddon.Labels = addon.Labels
 	originalAddon.Spec.InstallNamespace = addon.Spec.InstallNamespace
+	if addon.Spec.Configs != nil {
+		originalAddon.Spec.Configs = addon.Spec.Configs
+	}
 	_, err = addonClient.AddonV1alpha1().ManagedClusterAddOns(addon.Namespace).Update(context.TODO(), originalAddon, metav1.UpdateOptions{})
 	return err
 }