Skip to content

Commit 1692df4

Browse files
Pearl1594Pearl Dsilva
andauthored
cks: Fix destroying k8s cluster on shared networks (#4461)
* Fix destroying k8s cluster on shared networks * Extracted code Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
1 parent db3c12d commit 1692df4

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.cloud.kubernetes.cluster.KubernetesClusterVmMap;
3838
import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
3939
import com.cloud.network.IpAddress;
40+
import com.cloud.network.Network;
4041
import com.cloud.network.dao.NetworkVO;
4142
import com.cloud.network.rules.FirewallRule;
4243
import com.cloud.user.Account;
@@ -187,6 +188,13 @@ private void validateClusterVMsDestroyed() {
187188
}
188189
}
189190

191+
private void checkForRulesToDelete() throws ManagementServerException {
192+
NetworkVO kubernetesClusterNetwork = networkDao.findById(kubernetesCluster.getNetworkId());
193+
if (kubernetesClusterNetwork != null && kubernetesClusterNetwork.getGuestType() != Network.GuestType.Shared) {
194+
deleteKubernetesClusterNetworkRules();
195+
}
196+
}
197+
190198
public boolean destroy() throws CloudRuntimeException {
191199
init();
192200
validateClusterSate();
@@ -238,7 +246,7 @@ public boolean destroy() throws CloudRuntimeException {
238246
}
239247
} else {
240248
try {
241-
deleteKubernetesClusterNetworkRules();
249+
checkForRulesToDelete();
242250
} catch (ManagementServerException e) {
243251
String msg = String.format("Failed to remove network rules of Kubernetes cluster ID: %s", kubernetesCluster.getUuid());
244252
LOGGER.warn(msg, e);

0 commit comments

Comments
 (0)