Merge pull request #655 from hidekazuna/minorfix_lb

k8s-ci-robot · web-flow · commit 070921d7703e · 2020-10-22T22:35:45.000-07:00
🐛 Fix event message about port ID with associate Floating IP
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -65,7 +65,7 @@ func (s *Service) ReconcileLoadBalancer(clusterName string, openStackCluster *in
 	if err != nil {
 		return err
 	}
-	s.logger.Info("Associating floating ip", "ip", fp.FloatingIP)
+	s.logger.Info("Associating floating IP", "IP", fp.FloatingIP)
 	fpUpdateOpts := &floatingips.UpdateOpts{
 		PortID: &lb.VipPortID,
 	}
@@ -77,7 +77,7 @@ func (s *Service) ReconcileLoadBalancer(clusterName string, openStackCluster *in
 	if err != nil {
 		return err
 	}
-	record.Eventf(openStackCluster, "SuccessfulAssociateFloatingIP", "Associate floating IP %s with port %s", fp.FloatingIP, &lb.VipPortID)
+	record.Eventf(openStackCluster, "SuccessfulAssociateFloatingIP", "Associate floating IP %s with port %s", fp.FloatingIP, lb.VipPortID)
 
 	// lb listener
 	portList := []int{int(openStackCluster.Spec.ControlPlaneEndpoint.Port)}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (s Service) ReconcileLoadBalancer(clusterName string, openStackCluster in`
`65`	`65`	`if err != nil {`
`66`	`66`	`return err`
`67`	`67`	`}`
`68`		`- s.logger.Info("Associating floating ip", "ip", fp.FloatingIP)`
	`68`	`+ s.logger.Info("Associating floating IP", "IP", fp.FloatingIP)`
`69`	`69`	`fpUpdateOpts := &floatingips.UpdateOpts{`
`70`	`70`	`PortID: &lb.VipPortID,`
`71`	`71`	`}`
`@@ -77,7 +77,7 @@ func (s Service) ReconcileLoadBalancer(clusterName string, openStackCluster in`
`77`	`77`	`if err != nil {`
`78`	`78`	`return err`
`79`	`79`	`}`
`80`		`- record.Eventf(openStackCluster, "SuccessfulAssociateFloatingIP", "Associate floating IP %s with port %s", fp.FloatingIP, &lb.VipPortID)`
	`80`	`+ record.Eventf(openStackCluster, "SuccessfulAssociateFloatingIP", "Associate floating IP %s with port %s", fp.FloatingIP, lb.VipPortID)`
`81`	`81`
`82`	`82`	`// lb listener`
`83`	`83`	`portList := []int{int(openStackCluster.Spec.ControlPlaneEndpoint.Port)}`