feat(occm/lb): octavia prometheus listener's annotation fix on metricAllowedCIDRs

maxime.hubert · maxime.hubert · commit 281075f486df · 2025-03-03T11:37:02.000+01:00
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -1205,14 +1205,13 @@ func (lbaas *LbaasV2) ensureOctaviaListener(ctx context.Context, lbID string, na
 					listenerChanged = true
 				}
 			}
-
-			if listenerChanged {
-				klog.InfoS("Updating listener", "listenerID", listener.ID, "lbID", lbID, "updateOpts", updateOpts)
-				if err := openstackutil.UpdateListener(ctx, lbaas.lb, lbID, listener.ID, updateOpts); err != nil {
-					return nil, fmt.Errorf("failed to update listener %s of loadbalancer %s: %v", listener.ID, lbID, err)
-				}
-				klog.InfoS("Updated listener", "listenerID", listener.ID, "lbID", lbID)
+		}
+		if listenerChanged {
+			klog.InfoS("Updating listener", "listenerID", listener.ID, "lbID", lbID, "updateOpts", updateOpts)
+			if err := openstackutil.UpdateListener(ctx, lbaas.lb, lbID, listener.ID, updateOpts); err != nil {
+				return nil, fmt.Errorf("failed to update listener %s of loadbalancer %s: %v", listener.ID, lbID, err)
 			}
+			klog.InfoS("Updated listener", "listenerID", listener.ID, "lbID", lbID)
 		}
 	}
 	return listener, nil

Original file line number	Diff line number	Diff line change
`@@ -1205,14 +1205,13 @@ func (lbaas *LbaasV2) ensureOctaviaListener(ctx context.Context, lbID string, na`
`1205`	`1205`	`listenerChanged = true`
`1206`	`1206`	`}`
`1207`	`1207`	`}`
`1208`		`-`
`1209`		`- if listenerChanged {`
`1210`		`- klog.InfoS("Updating listener", "listenerID", listener.ID, "lbID", lbID, "updateOpts", updateOpts)`
`1211`		`- if err := openstackutil.UpdateListener(ctx, lbaas.lb, lbID, listener.ID, updateOpts); err != nil {`
`1212`		`- return nil, fmt.Errorf("failed to update listener %s of loadbalancer %s: %v", listener.ID, lbID, err)`
`1213`		`- }`
`1214`		`- klog.InfoS("Updated listener", "listenerID", listener.ID, "lbID", lbID)`
	`1208`	`+ }`
	`1209`	`+ if listenerChanged {`
	`1210`	`+ klog.InfoS("Updating listener", "listenerID", listener.ID, "lbID", lbID, "updateOpts", updateOpts)`
	`1211`	`+ if err := openstackutil.UpdateListener(ctx, lbaas.lb, lbID, listener.ID, updateOpts); err != nil {`
	`1212`	`+ return nil, fmt.Errorf("failed to update listener %s of loadbalancer %s: %v", listener.ID, lbID, err)`
`1215`	`1213`	`}`
	`1214`	`+ klog.InfoS("Updated listener", "listenerID", listener.ID, "lbID", lbID)`
`1216`	`1215`	`}`
`1217`	`1216`	`}`
`1218`	`1217`	`return listener, nil`