(cloudstack) branch 4.19 updated: cks: prevent npe on cluster listing with removed offering (#10075)

[dahn]

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

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new 4787885fc09 cks: prevent npe on cluster listing with removed offering 
(#10075)
4787885fc09 is described below

commit 4787885fc0911d2198e3dcf5166f20b1ebe9b393
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Fri Jan 24 14:17:52 2025 +0530

    cks: prevent npe on cluster listing with removed offering (#10075)
    
    Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
---
 .../java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
index bf5a3ef60c3..9c402f83b03 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -560,7 +560,7 @@ public class KubernetesClusterManagerImpl extends 
ManagerBase implements Kuberne
         if (template != null) {
             response.setTemplateId(template.getUuid());
         }
-        ServiceOfferingVO offering = 
serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+        ServiceOfferingVO offering = 
serviceOfferingDao.findByIdIncludingRemoved(kubernetesCluster.getServiceOfferingId());
         if (offering != null) {
             response.setServiceOfferingId(offering.getUuid());
             response.setServiceOfferingName(offering.getName());