improvements

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

ui/src/config/section/compute.js

@@ -19,6 +19,7 @@ import { shallowRef, defineAsyncComponent } from 'vue'
 import store from '@/store'
 import { isZoneCreated } from '@/utils/zone'
 import { getAPI, postAPI, getBaseUrl } from '@/api'
+import { getLatestKubernetesIsoParams } from '@/utils/acsrepo'
 
 export default {
   name: 'compute',
@@ -614,7 +615,6 @@ export default {
               run: async () => {
                 const params = {
                   name: 'CKS Instance',
-                  displaytext: 'CKS Instance',
                   cpunumber: 2,
                   cpuspeed: 1000,
                   memory: 2048,
@@ -667,13 +667,15 @@ export default {
               loadingLabel: 'message.adding.latest.kubernetes.iso',
               show: (store) => { return ('addKubernetesSupportedVersion' in store.getters.apis) },
               run: async () => {
-                const params = {
-                  semanticversion: '1.33.1',
-                  url: 'https://download.cloudstack.org/cks/setup-v1.33.1-calico-x86_64.iso',
-                  displaytext: 'CKS Instance',
-                  mincpunumber: 2,
-                  minmemory: 2048
+                let arch = 'x86_64'
+                if ('listClusters' in store.getters.apis) {
+                  try {
+                    const json = await getAPI('listClusters', { allocationstate: 'Enabled', page: 1, pagesize: 1 })
+                    const cluster = json?.listclustersresponse?.cluster?.[0] || {}
+                    arch = cluster.architecture || 'x86_64'
+                  } catch (error) {}
                 }
+                const params = await getLatestKubernetesIsoParams(arch)
                 try {
                   const json = await postAPI('addKubernetesSupportedVersion', params)
                   if (json?.addkubernetessupportedversionresponse?.kubernetessupportedversion) {
@@ -731,7 +733,7 @@ export default {
                 if (baseUrl.startsWith('/')) {
                   url = window.location.origin + baseUrl
                 }
-                var params = {
+                const params = {
                   name: 'endpoint.url',
                   value: url
                 }

ui/src/utils/acsrepo/index.js

@@ -0,0 +1,84 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+const BASE_KUBERNETES_ISO_URL = 'https://download.cloudstack.org/cks/'
+
+function getDefaultLatestKubernetesIsoParams (arch) {
+  return {
+    name: 'v1.33.1-calico-' + arch,
+    semanticversion: '1.33.1',
+    url: BASE_KUBERNETES_ISO_URL + 'setup-v1.33.1-calico-' + arch + '.iso',
+    arch: arch,
+    mincpunumber: 2,
+    minmemory: 2048
+  }
+}
+
+/**
+ * Returns the latest Kubernetes ISO info for the given architecture.
+ * Falls back to a hardcoded default if fetching fails.
+ * @param {string} arch
+ * @returns {Promise<{name: string, semanticversion: string, url: string, arch: string}>}
+ */
+export async function getLatestKubernetesIsoParams (arch) {
+  arch = arch || 'x86_64'
+  try {
+    const html = await fetch(BASE_KUBERNETES_ISO_URL, { cache: 'no-store' }).then(r => r.text())
+
+    // Grab all .iso hrefs from the index page
+    const hrefs = [...html.matchAll(/href="([^"]+\.iso)"/gi)].map(m => m[1])
+
+    // Prefer files that explicitly include the arch (e.g. ...-x86_64.iso)
+    let isoHrefs = hrefs.filter(h => new RegExp(`${arch}\\.iso$`, 'i').test(h))
+
+    // Fallback: older files without arch suffix (e.g. setup-1.28.4.iso)
+    if (isoHrefs.length === 0) {
+      isoHrefs = hrefs.filter(h => /setup-\d+\.\d+\.\d+\.iso$/i.test(h))
+    }
+
+    // Map to { name, semanticversion, url, arch }
+    const entries = isoHrefs.map(h => {
+      const m = h.match(/setup-(?:v)?(\d+\.\d+\.\d+)(?:-calico)?(?:-(x86_64|arm64))?/i)
+      return m
+        ? {
+          name: h.replace('.iso', ''),
+          semanticversion: m[1],
+          url: new URL(h, BASE_KUBERNETES_ISO_URL).toString(),
+          arch: m[2] || arch,
+          mincpunumber: 2,
+          minmemory: 2048
+        }
+        : null
+    }).filter(Boolean)
+
+    if (entries.length === 0) throw new Error('No matching ISOs found')
+
+    // Semver-style sort descending
+    entries.sort((a, b) => {
+      const pa = a.semanticversion.split('.').map(Number)
+      const pb = b.semanticversion.split('.').map(Number)
+      for (let i = 0; i < 3; i++) {
+        if ((pb[i] ?? 0) !== (pa[i] ?? 0)) return (pb[i] ?? 0) - (pa[i] ?? 0)
+      }
+      return 0
+    })
+
+    return entries[0]
+  } catch {
+    return { ...getDefaultLatestKubernetesIsoParams(arch) }
+  }
+}