(cloudstack) 01/06: Prevent addition of duplicate PF rules on scale up and no rules left behind on scale down (#32)

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch nsx-integration-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 523620f6e14f40439a649afb66568a9c513bdf86
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Mon Mar 11 11:59:11 2024 -0400

    Prevent addition of duplicate PF rules on scale up and no rules left behind 
on scale down (#32)
---
 .../actionworkers/KubernetesClusterResourceModifierActionWorker.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
index e8bc8e2851e..f500677754b 100644
--- 
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 @@ public class KubernetesClusterResourceModifierActionWorker 
extends KubernetesClu
         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,