[feat aga] few bugfixes and code refactoring

Author: shraddhabang

controllers/aga/globalaccelerator_controller.go

@@ -68,9 +68,6 @@ const (
 	requeueMessage          = "Monitoring provisioning state"
 	statusUpdateRequeueTime = 1 * time.Minute
 
-	// Status reason constants
-	EndpointLoadFailed = "EndpointLoadFailed"
-
 	// Metric stage constants
 	MetricStageFetchGlobalAccelerator     = "fetch_globalAccelerator"
 	MetricStageAddFinalizers              = "add_finalizers"
@@ -90,7 +87,7 @@ const (
 func NewGlobalAcceleratorReconciler(k8sClient client.Client, eventRecorder record.EventRecorder, finalizerManager k8s.FinalizerManager, config config.ControllerConfig, cloud services.Cloud, logger logr.Logger, metricsCollector lbcmetrics.MetricCollector, reconcileCounters *metricsutil.ReconcileCounters) *globalAcceleratorReconciler {
 
 	// Create tracking provider
-	trackingProvider := tracking.NewDefaultProvider(agaTagPrefix, config.ClusterName, tracking.WithRegion(config.AWSConfig.Region))
+	trackingProvider := tracking.NewDefaultProvider(agaTagPrefix, config.ClusterName, tracking.WithRegion(cloud.Region()))
 
 	// Create model builder
 	agaModelBuilder := aga.NewDefaultModelBuilder(
@@ -99,7 +96,7 @@ func NewGlobalAcceleratorReconciler(k8sClient client.Client, eventRecorder recor
 		trackingProvider,
 		config.FeatureGates,
 		config.ClusterName,
-		config.AWSConfig.Region,
+		cloud.Region(),
 		config.DefaultTags,
 		config.ExternalManagedTags,
 		logger.WithName("aga-model-builder"),
@@ -288,7 +285,7 @@ func (r *globalAcceleratorReconciler) reconcileGlobalAcceleratorResources(ctx co
 		r.logger.Error(err, "Fatal error loading endpoints")
 
 		// Handle other endpoint loading errors
-		if statusErr := r.statusUpdater.UpdateStatusFailure(ctx, ga, EndpointLoadFailed, err.Error()); statusErr != nil {
+		if statusErr := r.statusUpdater.UpdateStatusFailure(ctx, ga, agadeploy.EndpointLoadFailed, err.Error()); statusErr != nil {
 			r.logger.Error(statusErr, "Failed to update GlobalAccelerator status after endpoint load failure")
 		}
 		return err
@@ -302,6 +299,8 @@ func (r *globalAcceleratorReconciler) reconcileGlobalAcceleratorResources(ctx co
 	}
 	r.metricsCollector.ObserveControllerReconcileLatency(controllerName, MetricStageBuildModel, buildModelFn)
 	if err != nil {
+		r.eventRecorder.Event(ga, corev1.EventTypeWarning, k8s.GatewayEventReasonFailedBuildModel, fmt.Sprintf("Failed to build model: %v", err))
+		r.logger.Error(err, fmt.Sprintf("Failed to build model for: %v", k8s.NamespacedName(ga)))
 		// Update status to indicate model building failure
 		if statusErr := r.statusUpdater.UpdateStatusFailure(ctx, ga, agadeploy.ModelBuildFailed, fmt.Sprintf("Failed to build model: %v", err)); statusErr != nil {
 			r.logger.Error(statusErr, "Failed to update GlobalAccelerator status after model build failure")

go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
+	github.com/hashicorp/golang-lru v1.0.2
 	github.com/onsi/ginkgo/v2 v2.23.3
 	github.com/onsi/gomega v1.37.0
 	github.com/pkg/errors v0.9.1
@@ -104,7 +105,6 @@ require (
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imkira/go-interpol v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

main.go

@@ -241,7 +241,7 @@ func main() {
 	}
 
 	// Setup GlobalAccelerator controller only if enabled
-	if aga.IsAGAControllerEnabled(controllerCFG.FeatureGates, controllerCFG.AWSConfig.Region) {
+	if aga.IsAGAControllerEnabled(controllerCFG.FeatureGates, cloud.Region()) {
 		agaReconciler := agacontroller.NewGlobalAcceleratorReconciler(mgr.GetClient(), mgr.GetEventRecorderFor("globalAccelerator"),
 			finalizerManager, controllerCFG, cloud, ctrl.Log.WithName("controllers").WithName("globalAccelerator"), lbcMetricsCollector, reconcileCounters)
 		if err := agaReconciler.SetupWithManager(ctx, mgr, clientSet); err != nil {
@@ -442,7 +442,7 @@ func main() {
 	networkingwebhook.NewIngressValidator(mgr.GetClient(), controllerCFG.IngressConfig, ctrl.Log, lbcMetricsCollector).SetupWithManager(mgr)
 
 	// Setup GlobalAccelerator validator only if enabled
-	if aga.IsAGAControllerEnabled(controllerCFG.FeatureGates, controllerCFG.AWSConfig.Region) {
+	if aga.IsAGAControllerEnabled(controllerCFG.FeatureGates, cloud.Region()) {
 		agawebhook.NewGlobalAcceleratorValidator(ctrl.Log, lbcMetricsCollector).SetupWithManager(mgr)
 	}
 	//+kubebuilder:scaffold:builder

pkg/deploy/aga/errors.go

@@ -9,6 +9,9 @@ const (
 
 	// DeploymentFailed is the error code when stack deployment fails
 	DeploymentFailed = "DeploymentFailed"
+
+	// Status reason constants
+	EndpointLoadFailed = "EndpointLoadFailed"
 )
 
 // AcceleratorNotDisabledError is returned when an accelerator is not ready for deletion

pkg/k8s/events.go

@@ -52,6 +52,7 @@ const (
 	GlobalAcceleratorEventReasonFailedUpdateStatus     = "FailedUpdateStatus"
 	GlobalAcceleratorEventReasonFailedCleanup          = "FailedCleanup"
 	GlobalAcceleratorEventReasonFailedBuildModel       = "FailedBuildModel"
+	GlobalAcceleratorEventReasonFailedEndpointLoad     = "FailedEndpointLoad"
 	GlobalAcceleratorEventReasonFailedDeploy           = "FailedDeploy"
 	GlobalAcceleratorEventReasonSuccessfullyReconciled = "SuccessfullyReconciled"
 )

pkg/status/aga/status_updater.go

@@ -188,7 +188,7 @@ func (u *defaultStatusUpdater) UpdateStatusFailure(ctx context.Context, ga *v1be
 		Status:             metav1.ConditionFalse,
 		LastTransitionTime: metav1.Now(),
 		Reason:             reason,
-		Message:            message,
+		Message:            "Reconciliation failed. See events and controller logs for details",
 	}
 
 	conditionUpdated := u.updateCondition(&ga.Status.Conditions, failureCondition)