Skip to content

Commit f940220

Browse files
committed
fix for k8s iso arch
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent a096439 commit f940220

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ protected void updateTemplateDetailsInKubernetesSupportedVersionResponse(
9494
if (template.getState() != null) {
9595
response.setIsoState(template.getState().toString());
9696
}
97+
response.setIsoArch(template.getArch().getType());
9798
response.setDirectDownload(template.isDirectDownload());
9899
}
99100

plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ public class KubernetesSupportedVersionResponse extends BaseResponse {
5454
@Param(description = "the state of the binaries ISO for Kubernetes supported version")
5555
private String isoState;
5656

57+
@SerializedName(ApiConstants.ARCH)
58+
@Param(description = "the arch of the binaries ISO for Kubernetes supported version", since = "4.20.1")
59+
private String isoArch;
60+
5761
@SerializedName(ApiConstants.ZONE_ID)
5862
@Param(description = "the id of the zone in which Kubernetes supported version is available")
5963
private String zoneId;
@@ -138,6 +142,14 @@ public void setIsoState(String isoState) {
138142
this.isoState = isoState;
139143
}
140144

145+
public String getIsoArch() {
146+
return isoArch;
147+
}
148+
149+
public void setIsoArch(String isoArch) {
150+
this.isoArch = isoArch;
151+
}
152+
141153
public String getZoneId() {
142154
return zoneId;
143155
}

ui/src/config/section/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export default {
372372
permission: ['listKubernetesSupportedVersions'],
373373
searchFilters: ['zoneid', 'minimumsemanticversion', 'arch'],
374374
columns: ['name', 'state', 'semanticversion', 'isostate', 'mincpunumber', 'minmemory', 'arch', 'zonename'],
375-
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state', 'created'],
375+
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'arch', 'mincpunumber', 'minmemory', 'supportsha', 'state', 'created'],
376376
tabs: [
377377
{
378378
name: 'details',

0 commit comments

Comments
 (0)