Adds url kubernetes iso #10862

vits-hugs · 2025-05-13T17:41:13Z

Description

The URL used to register a kubernetes ISO is stored on the database, however it's not shown by the API listKubernetesSupportedVersion. This PR changes the API to return the kubernets ISO URL (isourl attribute) and the GUI to show it.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Screenshots (if appropriate):

Before modification:

After modification:

How Has This Been Tested?

I registered a kubernetes iso, and checked the API and GUI to see if the kubernetes ISO URL is appearing correctly.

vits-hugs · 2025-05-13T17:49:54Z

@blueorangutan ui

blueorangutan · 2025-05-13T17:51:04Z

@vits-hugs a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2025-05-13T18:08:09Z

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/10862 (QA-JID-621)

Copilot

Pull Request Overview

This PR enhances the Kubernetes ISO support by including the URL (isourl) in both the API response and the GUI display. Key changes include:

Adding the new attribute "isourl" to API response objects and updating its constant in ApiConstants.
Updating UI configuration and localization files to display the ISO URL.
Extending tests to verify that the ISO URL is returned only for admin users.

Reviewed Changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
ui/src/config/section/image.js	Added "url" to the image details fields and adjusted the conditional logic for admin views and upload parameter conditions.
ui/public/locales/pt_BR.json	Added the localized label for "isourl".
ui/public/locales/en.json	Added the localized label for "isourl".
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java	Extended tests to cover scenarios for admin and non-admin users related to ISO URL.
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java	Introduced a new field with getter and setter for the ISO URL.
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java	Updated response creation to include the ISO URL only for admin users.
api/src/main/java/org/apache/cloudstack/api/ApiConstants.java	Defined the new constant for "isourl".

Comments suppressed due to low confidence (1)

ui/src/config/section/image.js:121

Verify that removing the isZoneCreated() condition is intentional here, as its absence might allow template uploads in zones that are not yet fully initialized.

show: () => { return 'getUploadParamsForTemplate' in store.getters.apis }

codecov · 2025-05-14T06:02:46Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 16.18%. Comparing base (44119cf) to head (7ff3dca).
⚠️ Report is 1 commits behind head on 4.20.

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10862   +/-   ##
=========================================
  Coverage     16.18%   16.18%           
- Complexity    13300    13304    +4     
=========================================
  Files          5657     5657           
  Lines        498473   498483   +10     
  Branches      60495    60496    +1     
=========================================
+ Hits          80657    80676   +19     
+ Misses       408832   408825    -7     
+ Partials       8984     8982    -2

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`17.03% <100.00%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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

DaanHoogland · 2025-05-14T13:15:20Z

@blueorangutan package

blueorangutan · 2025-05-14T13:16:04Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-05-14T14:19:00Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13383

vits-hugs · 2025-05-14T17:58:16Z

@blueorangutan package

blueorangutan · 2025-05-14T18:00:03Z

@vits-hugs a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-05-14T18:23:45Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 13385

DaanHoogland · 2025-05-15T07:44:12Z

@vits-hugs , these are a bit awkward to search but here are the unit test failures: https://github.com/apache/cloudstack/actions/runs/15027619849/job/42263448047?pr=10862#step:7:14260

vits-hugs · 2025-05-15T19:47:38Z

@blueorangutan package

blueorangutan · 2025-05-15T19:48:03Z

@vits-hugs a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-05-15T20:54:26Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13404

shwstppr

While code looks fine, I'm not sure of design for checking if the KubernetesSupportedVersionResponse should have isoUrl.
Right now if the list API returns 10 versions it will query for root admin check 10 times.
@vits-hugs can we use ResponseView from the API class itself? This may require change in createKubernetesSupportedVersionResponse method. add/update API can always have ResponseView.Full while listAPI would need to check the caller and decide on Full/Restricted

weizhouapache

code lgtm

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

weizhouapache · 2025-05-16T07:52:04Z

While code looks fine, I'm not sure of design for checking if the KubernetesSupportedVersionResponse should have isoUrl. Right now if the list API returns 10 versions it will query for root admin check 10 times. @vits-hugs can we use ResponseView from the API class itself? This may require change in createKubernetesSupportedVersionResponse method. add/update API can always have ResponseView.Full while listAPI would need to check the caller and decide on Full/Restricted

+1

this PR could be optimised by adding isAdmin or isRootAdmin as the argument of the method, so that the following is run only once

        boolean isAdmin = accountManager.isRootAdmin(caller.getId());

vits-hugs · 2025-05-16T19:02:25Z

@blueorangutan package

blueorangutan · 2025-05-16T19:04:04Z

@vits-hugs a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

weizhouapache

code lgtm

Not tested

blueorangutan · 2025-05-16T20:13:00Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13425

vits-hugs · 2025-06-02T19:42:19Z

@blueorangutan ui

blueorangutan · 2025-06-02T19:43:04Z

@vits-hugs a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

vits-hugs · 2025-06-02T19:58:07Z

@weizhouapache could we run the tests here?

blueorangutan · 2025-06-02T20:02:01Z

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/10862 (QA-JID-634)

DaanHoogland · 2025-06-03T08:10:34Z

@blueorangutan package

blueorangutan · 2025-06-03T08:12:04Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-06-03T09:20:41Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13591

DaanHoogland · 2025-06-03T10:16:30Z

@blueorangutan test

blueorangutan · 2025-06-03T10:18:04Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-06-04T02:43:39Z

[SF] Trillian test result (tid-13463)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 56078 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10862-t13463-kvm-ol8.zip
Smoke tests completed. 141 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

shwstppr · 2025-09-03T12:30:00Z

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

        response.setSupportsAutoscaling(versionSupportsAutoscaling(kubernetesSupportedVersion));
-        updateTemplateDetailsInKubernetesSupportedVersionResponse(kubernetesSupportedVersion, response);
+        Account caller = CallContext.current().getCallingAccount();
+        boolean isRootAdmin = accountManager.isRootAdmin(caller.getId());


@vits-hugs sorry if I'm not getting it but I think we are still checking isRootAdmin for each version

weizhouapache · 2025-09-03T13:09:34Z

ui/src/config/section/image.js

          docHelp: 'adminguide/templates.html#uploading-templates-and-isos-from-a-local-computer',
          listView: true,
          popup: true,
-          show: () => { return isZoneCreated() && 'getUploadParamsForTemplate' in store.getters.apis },


why this is reverted ?
@vits-hugs

hsato03 · 2025-11-28T17:34:01Z

@weizhouapache @shwstppr Thanks for the reviews, I have addressed them in the last commits. Could you take another look, please?

cc @DaanHoogland

hsato03 · 2025-11-28T17:46:29Z

@blueorangutan package

blueorangutan · 2025-11-28T17:48:03Z

@hsato03 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-11-28T18:58:01Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15862

shwstppr

code lgtm

Adds url kubernetes iso

a076d22

boring-cyborg bot added component:api component:kubernetes component:UI labels May 13, 2025

DaanHoogland requested review from Copilot and shwstppr May 14, 2025 05:56

Copilot AI reviewed May 14, 2025

View reviewed changes

apache deleted a comment from Copilot AI May 14, 2025

shwstppr requested changes May 14, 2025

View reviewed changes

...ernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java Outdated Show resolved Hide resolved

Clean code

dcd3e60

Corrects test

aa48375

shwstppr reviewed May 16, 2025

View reviewed changes

weizhouapache reviewed May 16, 2025

View reviewed changes

...ernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java Outdated Show resolved Hide resolved

...ernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java Outdated Show resolved Hide resolved

Organize import, and clean the code

67225e2

weizhouapache approved these changes May 16, 2025

View reviewed changes

sureshanaparti added this to the 4.20.2 milestone Jun 5, 2025

shwstppr reviewed Sep 3, 2025

View reviewed changes

weizhouapache reviewed Sep 3, 2025

View reviewed changes

weizhouapache modified the milestones: 4.20.2, 4.20.3 Sep 10, 2025

hsato03 added 3 commits November 28, 2025 13:56

Address reviews

542c8a5

Merge branch '4.20' into url-kubernetes-iso

5e60eff

Restore registerTemplate changes

7ff3dca

DaanHoogland requested a review from shwstppr December 1, 2025 06:50

shwstppr approved these changes Dec 1, 2025

View reviewed changes

DaanHoogland added the status:needs-testing label Dec 1, 2025

Adds url kubernetes iso #10862

Are you sure you want to change the base?

Adds url kubernetes iso #10862

Conversation

vits-hugs commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

vits-hugs commented May 13, 2025

Uh oh!

blueorangutan commented May 13, 2025

Uh oh!

blueorangutan commented May 13, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

codecov bot commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

DaanHoogland commented May 14, 2025

Uh oh!

blueorangutan commented May 14, 2025

Uh oh!

blueorangutan commented May 14, 2025

Uh oh!

vits-hugs commented May 14, 2025

Uh oh!

blueorangutan commented May 14, 2025

Uh oh!

blueorangutan commented May 14, 2025

Uh oh!

DaanHoogland commented May 15, 2025

Uh oh!

vits-hugs commented May 15, 2025

Uh oh!

blueorangutan commented May 15, 2025

Uh oh!

blueorangutan commented May 15, 2025

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented May 16, 2025

Uh oh!

vits-hugs commented May 16, 2025

Uh oh!

blueorangutan commented May 16, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 16, 2025

Uh oh!

vits-hugs commented Jun 2, 2025

Uh oh!

blueorangutan commented Jun 2, 2025

Uh oh!

vits-hugs commented Jun 2, 2025

Uh oh!

blueorangutan commented Jun 2, 2025

Uh oh!

DaanHoogland commented Jun 3, 2025

Uh oh!

blueorangutan commented Jun 3, 2025

Uh oh!

vits-hugs commented May 13, 2025 •

edited

Loading

codecov bot commented May 14, 2025 •

edited

Loading