Merge pull request #1853 from elastx/lb-stacktrace-fix

k8s-ci-robot · web-flow · commit 84e1f4e8fbee · 2024-02-02T08:22:33.000-08:00
🐛Fix a stacktrace in LB logic by removing listener name from an error message when not set
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -285,9 +285,10 @@ func (s *Service) getOrUpdateAllowedCIDRS(openStackCluster *infrav1.OpenStackClu
 			AllowedCIDRs: &allowedCIDRs,
 		}
 
+		listenerID := listener.ID
 		listener, err := s.loadbalancerClient.UpdateListener(listener.ID, listenerUpdateOpts)
 		if err != nil {
-			record.Warnf(openStackCluster, "FailedUpdateListener", "Failed to update listener %s: %v", listener.Name, err)
+			record.Warnf(openStackCluster, "FailedUpdateListener", "Failed to update listener %s: %v", listenerID, err)
 			return err
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -285,9 +285,10 @@ func (s Service) getOrUpdateAllowedCIDRS(openStackCluster infrav1.OpenStackClu`
`285`	`285`	`AllowedCIDRs: &allowedCIDRs,`
`286`	`286`	`}`
`287`	`287`
	`288`	`+ listenerID := listener.ID`
`288`	`289`	`listener, err := s.loadbalancerClient.UpdateListener(listener.ID, listenerUpdateOpts)`
`289`	`290`	`if err != nil {`
`290`		`- record.Warnf(openStackCluster, "FailedUpdateListener", "Failed to update listener %s: %v", listener.Name, err)`
	`291`	`+ record.Warnf(openStackCluster, "FailedUpdateListener", "Failed to update listener %s: %v", listenerID, err)`
`291`	`292`	`return err`
`292`	`293`	`}`
`293`	`294`