Add support for adding k8s supported version by iso id

Author: vishesh92

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

@@ -22,6 +22,7 @@
 
 import javax.inject.Inject;
 
+import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.kubernetes.version.AddKubernetesSupportedVersionCmd;
@@ -312,6 +313,7 @@ public KubernetesSupportedVersionResponse addKubernetesSupportedVersion(final Ad
         final String semanticVersion = cmd.getSemanticVersion();
         final Long zoneId = cmd.getZoneId();
         final String isoUrl = cmd.getUrl();
+        final Long isoId = cmd.getIsoId();
         final String isoChecksum = cmd.getChecksum();
         final Integer minimumCpu = cmd.getMinimumCpu();
         final Integer minimumRamSize = cmd.getMinimumRamSize();
@@ -334,8 +336,8 @@ public KubernetesSupportedVersionResponse addKubernetesSupportedVersion(final Ad
                 throw new InvalidParameterValueException(String.format("Zone: %s supports only direct download Kubernetes versions", zone.getName()));
             }
         }
-        if (StringUtils.isEmpty(isoUrl)) {
-            throw new InvalidParameterValueException(String.format("Invalid URL for ISO specified, %s", isoUrl));
+        if (StringUtils.isEmpty(isoUrl) && isoId == null) {
+            throw new InvalidParameterValueException(String.format("Either %s or %s parameter is required", ApiConstants.URL, ApiConstants.ISO_ID));
         }
         if (StringUtils.isEmpty(name)) {
             name = String.format("v%s", semanticVersion);
@@ -345,12 +347,23 @@ public KubernetesSupportedVersionResponse addKubernetesSupportedVersion(final Ad
         }
 
         VMTemplateVO template = null;
-        try {
-            VirtualMachineTemplate vmTemplate = registerKubernetesVersionIso(zoneId, name, isoUrl, isoChecksum, isDirectDownload);
-            template = templateDao.findById(vmTemplate.getId());
-        } catch (IllegalAccessException | NoSuchFieldException | IllegalArgumentException | ResourceAllocationException ex) {
-            logger.error(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl), ex);
-            throw new CloudRuntimeException(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl));
+
+        if (isoId != null) {
+            template = templateDao.findById(isoId);
+            if (template == null) {
+                throw new InvalidParameterValueException(String.format("Invalid ISO ID specified, %s", isoId));
+            }
+            accountManager.checkAccess(CallContext.current().getCallingAccount(), SecurityChecker.AccessType.UseEntry, true, template);
+        }
+        if (template == null) {
+            try {
+                VirtualMachineTemplate vmTemplate = registerKubernetesVersionIso(zoneId, name, isoUrl, isoChecksum, isDirectDownload);
+                template = templateDao.findById(vmTemplate.getId());
+            } catch (IllegalAccessException | NoSuchFieldException | IllegalArgumentException |
+                     ResourceAllocationException ex) {
+                logger.error(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl), ex);
+                throw new CloudRuntimeException(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl));
+            }
         }
 
         KubernetesSupportedVersionVO supportedVersionVO = new KubernetesSupportedVersionVO(name, semanticVersion, template.getId(), zoneId, minimumCpu, minimumRamSize);

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

@@ -30,6 +30,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.AdminCmd;
 import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.StringUtils;
@@ -71,6 +72,10 @@ public class AddKubernetesSupportedVersionCmd extends BaseCmd implements AdminCm
             description = "the URL of the binaries ISO for Kubernetes supported version")
     private String url;
 
+    @Parameter(name = ApiConstants.ISO_ID, type = CommandType.UUID, entityType = TemplateResponse.class,
+            description = "the ID of the binaries ISO for Kubernetes supported version")
+    private Long isoId;
+
     @Parameter(name = ApiConstants.CHECKSUM, type = CommandType.STRING,
             description = "the checksum value of the binaries ISO. " + ApiConstants.CHECKSUM_PARAMETER_PREFIX_DESCRIPTION)
     private String checksum;
@@ -114,6 +119,10 @@ public String getUrl() {
         return url;
     }
 
+    public Long getIsoId() {
+        return isoId;
+    }
+
     public String getChecksum() {
         return checksum;
     }