Prevent addition of duplicate PF rules on scale up and no rules left behind on scale down (#32)

Pearl1594 · Pearl1594 · commit 523620f6e14f · 2024-04-12T09:57:39.000-04:00
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -551,9 +551,12 @@ protected void removePortForwardingRules(final IpAddress publicIp, final Network
         for (PortForwardingRuleVO pfRule : pfRules) {
             if (startPort <= pfRule.getSourcePortStart() && pfRule.getSourcePortStart() <= endPort) {
                 portForwardingRulesDao.remove(pfRule.getId());
+                LOGGER.trace("Marking PF rule " + pfRule + " with Revoke state");
+                pfRule.setState(FirewallRule.State.Revoke);
+
             }
         }
-        rulesService.applyPortForwardingRules(publicIp.getId(), account);
+        firewallManager.applyRules(pfRules, false, true);
     }
 
     protected void removeLoadBalancingRule(final IpAddress publicIp, final Network network,

Original file line number	Diff line number	Diff line change
`@@ -551,9 +551,12 @@ protected void removePortForwardingRules(final IpAddress publicIp, final Network`
`551`	`551`	`for (PortForwardingRuleVO pfRule : pfRules) {`
`552`	`552`	`if (startPort <= pfRule.getSourcePortStart() && pfRule.getSourcePortStart() <= endPort) {`
`553`	`553`	`portForwardingRulesDao.remove(pfRule.getId());`
	`554`	`+ LOGGER.trace("Marking PF rule " + pfRule + " with Revoke state");`
	`555`	`+ pfRule.setState(FirewallRule.State.Revoke);`
	`556`	`+`
`554`	`557`	`}`
`555`	`558`	`}`
`556`		`- rulesService.applyPortForwardingRules(publicIp.getId(), account);`
	`559`	`+ firewallManager.applyRules(pfRules, false, true);`
`557`	`560`	`}`
`558`	`561`
`559`	`562`	`protected void removeLoadBalancingRule(final IpAddress publicIp, final Network network,`