diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java index 62bd8b4576a4..1327b6e45cce 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java @@ -141,7 +141,7 @@ private void destroyKubernetesClusterNetwork() throws ManagementServerException if (network != null && network.getRemoved() == null) { Account owner = accountManager.getAccount(network.getAccountId()); User callerUser = accountManager.getActiveUser(CallContext.current().getCallingUserId()); - ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner); + ReservationContext context = new ReservationContextImpl(null, null, callerUser, CallContext.current().getCallingAccount()); releaseASNumber(kubernetesCluster.getZoneId(), kubernetesCluster.getNetworkId()); boolean networkDestroyed = networkMgr.destroyNetwork(kubernetesCluster.getNetworkId(), context, true); if (!networkDestroyed) { diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 6575da47364b..969c33fd53ab 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -2924,7 +2924,7 @@ public boolean deleteNetwork(long networkId, boolean forced) { } User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId()); - ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner); + ReservationContext context = new ReservationContextImpl(null, null, callerUser, caller); return _networkMgr.destroyNetwork(networkId, context, forced); } diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index 5717f8745aca..93de0f729fdf 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -2851,7 +2851,7 @@ protected boolean deletePrivateGatewayFromTheDB(final PrivateGateway gateway) { if (deleteNetworkFinal) { final User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId()); final Account owner = _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM); - final ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner); + final ReservationContext context = new ReservationContextImpl(null, null, callerUser, CallContext.current().getCallingAccount()); _ntwkMgr.destroyNetwork(networkId, context, false); logger.debug("Deleted private network {}", network); }