Cleanup constants

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · Mar 2, 2024 · aa7906b · aa7906b
1 parent 96f0248
commit aa7906b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/apis/fluxcd/v1alpha1/fluxcdconfig_types.go b/apis/fluxcd/v1alpha1/fluxcdconfig_types.go
@@ -23,6 +23,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
+const (
+	ResourceKindFluxCDConfig = "FluxCDConfig"
+	ResourceFluxCDConfig     = "fluxcdconfig"
+	ResourceFluxCDConfigs    = "fluxcdconfigs"
+)
+
 // FluxCDConfigSpec defines the desired state of FluxCDConfig
 type FluxCDConfigSpec struct {
 	InstallCRDs bool `json:"installCRDs"`

diff --git a/pkg/manager/helpers.go b/pkg/manager/helpers.go
@@ -20,6 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	fluxcdv1alpha1 "github.com/kluster-manager/fluxcd-addon/apis/fluxcd/v1alpha1"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
 	"open-cluster-management.io/addon-framework/pkg/addonfactory"
@@ -31,17 +33,6 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-const (
-	// FluxCDConfigVersion defines the API version used for FluxCDConfigs.
-	FluxCDConfigVersion = "v1alpha1"
-
-	// FluxCDConfigResource is the resource name for FluxCDConfig objects.
-	FluxCDConfigResource = "fluxcdconfigs"
-
-	// FluxCDConfigGroup is the group name for FluxCDConfig objects.
-	FluxCDConfigGroup = "fluxcd.open-cluster-management.io"
-)
-
 // GetConfigValues returns a function that retrieves and transforms configuration values from
 // FluxCDConfig objects. The function fetches configuration references from a ManagedClusterAddOn,
 // reads corresponding FluxCDConfig objects, extracts their specifications, and converts them into
@@ -50,8 +41,8 @@ func GetConfigValues(kc client.Client) addonfactory.GetValuesFunc {
 	return func(cluster *clusterv1.ManagedCluster, addon *v1alpha1.ManagedClusterAddOn) (addonfactory.Values, error) {
 		overrideValues := addonfactory.Values{}
 		for _, refConfig := range addon.Status.ConfigReferences {
-			if refConfig.ConfigGroupResource.Group != FluxCDConfigGroup ||
-				refConfig.ConfigGroupResource.Resource != FluxCDConfigResource {
+			if refConfig.ConfigGroupResource.Group != fluxcdv1alpha1.GroupVersion.Group ||
+				refConfig.ConfigGroupResource.Resource != fluxcdv1alpha1.ResourceFluxCDConfigs {
 				continue
 			}
 

diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
@@ -20,11 +20,10 @@ import (
 	"context"
 	"embed"
 
-	fluxapi1alpha1 "github.com/kluster-manager/fluxcd-addon/apis/fluxcd/v1alpha1"
+	fluxcdv1alpha1 "github.com/kluster-manager/fluxcd-addon/apis/fluxcd/v1alpha1"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/rest"
 	"k8s.io/component-base/version"
@@ -55,7 +54,7 @@ const (
 var scheme = runtime.NewScheme()
 
 func init() {
-	utilruntime.Must(fluxapi1alpha1.AddToScheme(scheme))
+	utilruntime.Must(fluxcdv1alpha1.AddToScheme(scheme))
 }
 
 // NewManagerCommand creates a command for starting the addon manager controller.
@@ -86,9 +85,7 @@ func runManagerController(ctx context.Context, kubeConfig *rest.Config) error {
 
 	// Initialize the agent addon factory and configure it.
 	agent, err := addonfactory.NewAgentAddonFactory(AddonName, FS, AgentManifestsDir).
-		WithConfigGVRs(
-			schema.GroupVersionResource{Group: FluxCDConfigGroup, Version: FluxCDConfigVersion, Resource: FluxCDConfigResource},
-		).
+		WithConfigGVRs(fluxcdv1alpha1.GroupVersion.WithResource(fluxcdv1alpha1.ResourceFluxCDConfigs)).
 		WithGetValuesFuncs(GetConfigValues(kubeClient)).
 		WithAgentHealthProber(agentHealthProber()).
 		WithAgentInstallNamespace(func(addon *v1alpha1.ManagedClusterAddOn) string { return AgentInstallNamespace }).