fix k8s iso response

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java

@@ -22,7 +22,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.cpu.CPU;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.kubernetes.version.AddKubernetesSupportedVersionCmd;
@@ -38,6 +37,7 @@
 
 import com.cloud.api.query.dao.TemplateJoinDao;
 import com.cloud.api.query.vo.TemplateJoinVO;
+import com.cloud.cpu.CPU;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
@@ -58,6 +58,7 @@
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.JoinBuilder;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -268,6 +269,7 @@ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedV
         final Long zoneId = cmd.getZoneId();
         String minimumSemanticVersion = cmd.getMinimumSemanticVersion();
         final Long minimumKubernetesVersionId = cmd.getMinimumKubernetesVersionId();
+        final String arch = cmd.getArch();
         if (StringUtils.isNotEmpty(minimumSemanticVersion) && minimumKubernetesVersionId != null) {
             throw new CloudRuntimeException(String.format("Both parameters %s and %s can not be passed together", ApiConstants.MIN_SEMANTIC_VERSION, ApiConstants.MIN_KUBERNETES_VERSION_ID));
         }
@@ -282,6 +284,13 @@ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedV
         SearchBuilder<KubernetesSupportedVersionVO> sb = kubernetesSupportedVersionDao.createSearchBuilder();
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        if (StringUtils.isNotBlank(arch)) {
+            SearchBuilder<VMTemplateVO> isoSearch = templateDao.createSearchBuilder();
+            isoSearch.and("arch", isoSearch.entity().getArch(), SearchCriteria.Op.EQ);
+            sb.join("isoSearch", isoSearch, isoSearch.entity().getId(), sb.entity().getIsoId(), JoinBuilder.JoinType.INNER);
+            isoSearch.done();
+        }
+        sb.done();
         SearchCriteria<KubernetesSupportedVersionVO> sc = sb.create();
         String keyword = cmd.getKeyword();
         if (versionId != null) {
@@ -296,6 +305,9 @@ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedV
         if(keyword != null){
             sc.setParameters("keyword", "%" + keyword + "%");
         }
+        if (StringUtils.isNotBlank(arch)) {
+            sc.setJoinParameters("isoSearch", "arch", arch);
+        }
         Pair<List<KubernetesSupportedVersionVO>, Integer> versionsAndCount =
                 kubernetesSupportedVersionDao.searchAndCount(sc, searchFilter);
         List<KubernetesSupportedVersionVO> versions =

plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java

@@ -66,6 +66,11 @@ public class ListKubernetesSupportedVersionsCmd extends BaseListCmd {
             description = "the ID of the minimum Kubernetes supported version")
     private Long minimumKubernetesVersionId;
 
+    @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
+            description = "the CPU arch of the binaries ISO. Valid options are: x86_64, aarch64",
+            since = "4.20")
+    private String arch;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -85,6 +90,10 @@ public String getMinimumSemanticVersion() {
         return minimumSemanticVersion;
     }
 
+    public String getArch() {
+        return arch;
+    }
+
     public Long getMinimumKubernetesVersionId() {
         return minimumKubernetesVersionId;
     }