Skip to content

Commit a9a2aa9

Browse files
CKS: add created to k8s cluster and k8s version (#6446)
This PR adds created info to the response of kubernetes clusters and kubernetes supported version.
1 parent ae46c33 commit a9a2aa9

8 files changed

Lines changed: 27 additions & 2 deletions

File tree

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
588588
response.setAutoscalingEnabled(kubernetesCluster.getAutoscalingEnabled());
589589
response.setMinSize(kubernetesCluster.getMinSize());
590590
response.setMaxSize(kubernetesCluster.getMaxSize());
591+
response.setCreated(kubernetesCluster.getCreated());
591592
return response;
592593
}
593594

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.apache.cloudstack.api.Identity;
2121
import org.apache.cloudstack.api.InternalIdentity;
2222

23+
import java.util.Date;
24+
2325
/**
2426
* KubernetesSupportedVersion describes the properties of supported kubernetes version
2527
*
@@ -36,6 +38,7 @@ public enum State {
3638
long getIsoId();
3739
Long getZoneId();
3840
State getState();
41+
Date getCreated();
3942

4043
/**
4144
* @return minimum # of cpu.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ public void setMinimumRamSize(int minimumRamSize) {
158158
this.minimumRamSize = minimumRamSize;
159159
}
160160

161+
@Override
161162
public Date getCreated() {
162163
return created;
163164
}

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
@@ -105,6 +105,7 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo
105105
response.setIsoName(template.getName());
106106
response.setIsoState(template.getState().toString());
107107
}
108+
response.setCreated(kubernetesSupportedVersion.getCreated());
108109
return response;
109110
}
110111

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.response;
1818

19+
import java.util.Date;
1920
import java.util.List;
2021

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

162+
@SerializedName(ApiConstants.CREATED)
163+
@Param(description = "the date when this Kubernetes cluster was created")
164+
private Date created;
165+
161166
public KubernetesClusterResponse() {
162167
}
163168

@@ -377,4 +382,8 @@ public void setMinSize(Long minSize) {
377382
public void setMaxSize(Long maxSize) {
378383
this.maxSize = maxSize;
379384
}
385+
386+
public void setCreated(Date created) {
387+
this.created = created;
388+
}
380389
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import com.cloud.serializer.Param;
2626
import com.google.gson.annotations.SerializedName;
2727

28+
import java.util.Date;
29+
2830
@SuppressWarnings("unused")
2931
@EntityReference(value = {KubernetesSupportedVersion.class})
3032
public class KubernetesSupportedVersionResponse extends BaseResponse {
@@ -80,6 +82,10 @@ public class KubernetesSupportedVersionResponse extends BaseResponse {
8082
@Param(description = "the minimum RAM size in MB needed for the Kubernetes supported version")
8183
private Integer minimumRamSize;
8284

85+
@SerializedName(ApiConstants.CREATED)
86+
@Param(description = "the date when this Kubernetes supported version was created")
87+
private Date created;
88+
8389
public String getId() {
8490
return id;
8591
}
@@ -183,4 +189,8 @@ public Boolean getSupportsAutoscaling() {
183189
public void setSupportsAutoscaling(Boolean supportsAutoscaling) {
184190
this.supportsAutoscaling = supportsAutoscaling;
185191
}
192+
193+
public void setCreated(Date created) {
194+
this.created = created;
195+
}
186196
}

ui/src/config/section/compute.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ export default {
435435
fields.push('zonename')
436436
return fields
437437
},
438-
details: ['name', 'description', 'zonename', 'kubernetesversionname', 'autoscalingenabled', 'minsize', 'maxsize', 'size', 'controlnodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename'],
438+
details: ['name', 'description', 'zonename', 'kubernetesversionname', 'autoscalingenabled', 'minsize', 'maxsize', 'size', 'controlnodes', 'cpunumber', 'memory', 'keypair', 'associatednetworkname', 'account', 'domain', 'zonename', 'created'],
439439
tabs: [{
440440
name: 'k8s',
441441
component: shallowRef(defineAsyncComponent(() => import('@/views/compute/KubernetesServiceTab.vue')))

ui/src/config/section/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ export default {
323323
docHelp: 'plugins/cloudstack-kubernetes-service.html#kubernetes-supported-versions',
324324
permission: ['listKubernetesSupportedVersions'],
325325
columns: ['name', 'state', 'semanticversion', 'isostate', 'mincpunumber', 'minmemory', 'zonename'],
326-
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state'],
326+
details: ['name', 'semanticversion', 'supportsautoscaling', 'zoneid', 'zonename', 'isoid', 'isoname', 'isostate', 'mincpunumber', 'minmemory', 'supportsha', 'state', 'created'],
327327
actions: [
328328
{
329329
api: 'addKubernetesSupportedVersion',

0 commit comments

Comments
 (0)