Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
response.setAutoscalingEnabled(kubernetesCluster.getAutoscalingEnabled());
response.setMinSize(kubernetesCluster.getMinSize());
response.setMaxSize(kubernetesCluster.getMaxSize());
response.setCreated(kubernetesCluster.getCreated());
return response;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;

import java.util.Date;

/**
* KubernetesSupportedVersion describes the properties of supported kubernetes version
*
Expand All @@ -36,6 +38,7 @@ public enum State {
long getIsoId();
Long getZoneId();
State getState();
Date getCreated();

/**
* @return minimum # of cpu.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public void setMinimumRamSize(int minimumRamSize) {
this.minimumRamSize = minimumRamSize;
}

@Override
public Date getCreated() {
return created;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo
response.setIsoName(template.getName());
response.setIsoState(template.getState().toString());
}
response.setCreated(kubernetesSupportedVersion.getCreated());
return response;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.response;

import java.util.Date;
import java.util.List;

import org.apache.cloudstack.api.ApiConstants;
Expand Down Expand Up @@ -158,6 +159,10 @@ public class KubernetesClusterResponse extends BaseResponseWithAnnotations imple
@Param(description = "Maximum size of the cluster")
private Long maxSize;

@SerializedName(ApiConstants.CREATED)
@Param(description = "the date when this Kubernetes cluster was created")
private Date created;

public KubernetesClusterResponse() {
}

Expand Down Expand Up @@ -377,4 +382,8 @@ public void setMinSize(Long minSize) {
public void setMaxSize(Long maxSize) {
this.maxSize = maxSize;
}

public void setCreated(Date created) {
this.created = created;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;

import java.util.Date;

@SuppressWarnings("unused")
@EntityReference(value = {KubernetesSupportedVersion.class})
public class KubernetesSupportedVersionResponse extends BaseResponse {
Expand Down Expand Up @@ -80,6 +82,10 @@ public class KubernetesSupportedVersionResponse extends BaseResponse {
@Param(description = "the minimum RAM size in MB needed for the Kubernetes supported version")
private Integer minimumRamSize;

@SerializedName(ApiConstants.CREATED)
@Param(description = "the date when this Kubernetes supported version was created")
private Date created;

public String getId() {
return id;
}
Expand Down Expand Up @@ -183,4 +189,8 @@ public Boolean getSupportsAutoscaling() {
public void setSupportsAutoscaling(Boolean supportsAutoscaling) {
this.supportsAutoscaling = supportsAutoscaling;
}

public void setCreated(Date created) {
this.created = created;
}
}
2 changes: 1 addition & 1 deletion ui/src/config/section/compute.js
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ export default {
fields.push('zonename')
return fields
},
details: ['name', 'description', 'zonename', 'kubernetesversionname', 'autoscalingenabled', 'minsize', 'maxsize', 'size', 'controlnodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename'],
details: ['name', 'description', 'zonename', 'kubernetesversionname', 'autoscalingenabled', 'minsize', 'maxsize', 'size', 'controlnodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename', 'created'],
tabs: [{
name: 'k8s',
component: shallowRef(defineAsyncComponent(() => import('@/views/compute/KubernetesServiceTab.vue')))
Expand Down
2 changes: 1 addition & 1 deletion ui/src/config/section/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export default {
docHelp: 'plugins/cloudstack-kubernetes-service.html#kubernetes-supported-versions',
permission: ['listKubernetesSupportedVersions'],
columns: ['name', 'state', 'semanticversion', 'isostate', 'mincpunumber', 'minmemory', 'zonename'],
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state'],
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state', 'created'],
actions: [
{
api: 'addKubernetesSupportedVersion',
Expand Down