Merge pull request #1532 from k8s-infra-cherrypick-robot/cherry-pick-1531-to-release-0.7

k8s-ci-robot · web-flow · commit 9ca13826c69d · 2023-04-27T08:54:16.000-07:00
[release-0.7] 🌱 Remove creation of 2 Events for the same event
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -364,8 +364,7 @@ func (s *Service) getOrCreateMonitor(openStackCluster *infrav1.OpenStackCluster,
 	monitor, err = s.loadbalancerClient.CreateMonitor(monitorCreateOpts)
 	// Skip creating monitor if it is not supported by Octavia provider
 	if capoerrors.IsNotImplementedError(err) {
-		record.Warnf(openStackCluster, "SkippedCreateMonitor", "Health monitors are not supported with the current Octavia provider.")
-		record.Eventf(openStackCluster, "SkippedCreateMonitor", "Health Monitor is not created as it's not implemented with the current Octavia provider.")
+		record.Warnf(openStackCluster, "SkippedCreateMonitor", "Health Monitor is not created as it's not implemented with the current Octavia provider.")
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,7 @@ func (s Service) getOrCreateMonitor(openStackCluster infrav1.OpenStackCluster,`
`364`	`364`	`monitor, err = s.loadbalancerClient.CreateMonitor(monitorCreateOpts)`
`365`	`365`	`// Skip creating monitor if it is not supported by Octavia provider`
`366`	`366`	`if capoerrors.IsNotImplementedError(err) {`
`367`		`- record.Warnf(openStackCluster, "SkippedCreateMonitor", "Health monitors are not supported with the current Octavia provider.")`
`368`		`- record.Eventf(openStackCluster, "SkippedCreateMonitor", "Health Monitor is not created as it's not implemented with the current Octavia provider.")`
	`367`	`+ record.Warnf(openStackCluster, "SkippedCreateMonitor", "Health Monitor is not created as it's not implemented with the current Octavia provider.")`
`369`	`368`	`return nil`
`370`	`369`	`}`
`371`	`370`