From 8ff0071becf92b0bb8ce9e5503502a705f98920e Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 25 May 2023 15:22:58 +0530 Subject: [PATCH] ui,api: make description option for createKubernetesCluster (#7541) Make the description for createKubernetesCLuster API optional. Similar to #7180 Signed-off-by: Abhishek Kumar --- .../user/kubernetes/cluster/CreateKubernetesClusterCmd.java | 5 +++-- ui/src/views/compute/CreateKubernetesCluster.vue | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java index 5e4bd391587..4f242ea461d 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java @@ -39,6 +39,7 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import com.cloud.kubernetes.cluster.KubernetesCluster; @@ -68,7 +69,7 @@ public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name for the Kubernetes cluster") private String name; - @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = true, description = "description for the Kubernetes cluster") + @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "description for the Kubernetes cluster") private String description; @ACL(accessType = AccessType.UseEntry) @@ -155,7 +156,7 @@ public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd { } public String getDisplayName() { - return description; + return StringUtils.firstNonEmpty(description, name); } public Long getDomainId() { diff --git a/ui/src/views/compute/CreateKubernetesCluster.vue b/ui/src/views/compute/CreateKubernetesCluster.vue index 5735b7ed359..709378dcde7 100644 --- a/ui/src/views/compute/CreateKubernetesCluster.vue +++ b/ui/src/views/compute/CreateKubernetesCluster.vue @@ -284,7 +284,6 @@ export default { }) this.rules = reactive({ name: [{ required: true, message: this.$t('message.error.kubecluster.name') }], - description: [{ required: true, message: this.$t('message.error.cluster.description') }], zoneid: [{ required: true, message: this.$t('message.error.zone.for.cluster') }], kubernetesversionid: [{ required: true, message: this.$t('message.error.version.for.cluster') }], serviceofferingid: [{ required: true, message: this.$t('message.error.serviceoffering.for.cluster') }],