You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2024/07/29 05:19:05 UTC
(cloudstack) branch 4.19 updated: Fixup CKS UI for external managed clusters (#9434)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 0be87ac6545 Fixup CKS UI for external managed clusters (#9434)
0be87ac6545 is described below
commit 0be87ac654550290123795f526c101fb86b88507
Author: Vishesh <vi...@gmail.com>
AuthorDate: Mon Jul 29 10:48:58 2024 +0530
Fixup CKS UI for external managed clusters (#9434)
---
.../cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java | 3 +--
ui/src/components/view/ListView.vue | 8 ++++----
ui/src/views/compute/KubernetesServiceTab.vue | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
index 5283a1273c4..2e65c980437 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -1625,8 +1625,7 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
private void updateNodeCount(KubernetesClusterVO kubernetesCluster) {
List<KubernetesClusterVmMapVO> nodeList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
kubernetesCluster.setControlNodeCount(nodeList.stream().filter(KubernetesClusterVmMapVO::isControlNode).count());
- kubernetesCluster.setNodeCount(nodeList.size());
- kubernetesCluster.setNodeCount(nodeList.size());
+ kubernetesCluster.setNodeCount(nodeList.size() - kubernetesCluster.getControlNodeCount());
kubernetesClusterDao.persist(kubernetesCluster);
}
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 8512dab7c05..ff2e385f03c 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -92,9 +92,6 @@
</span>
</span>
</template>
- <template v-if="record.clustertype === 'ExternalManaged' && $route.path.split('/')[1] === 'kubernetes' && ['cpunumber', 'memory', 'size'].includes(column.key)">
- <span>{{ text <= 0 ? 'N/A' : text }}</span>
- </template>
<template v-if="column.key === 'templatetype'">
<span>{{ text }}</span>
</template>
@@ -170,7 +167,10 @@
<router-link v-if="resourceIdToValidLinksMap[record.id]?.volume" :to="{ path: '/volume/' + record.volumeid }">{{ text }}</router-link>
<span v-else>{{ text }}</span>
</template>
- <template v-if="column.key === 'size'">
+ <template v-if="record.clustertype === 'ExternalManaged' && $route.path.split('/')[1] === 'kubernetes' && ['kubernetesversionname', 'cpunumber', 'memory', 'size'].includes(column.key)">
+ <span>{{ text <= 0 || !text ? 'N/A' : text }}</span>
+ </template>
+ <template v-else-if="column.key === 'size'">
<span v-if="text && $route.path === '/kubernetes'">
{{ text }}
</span>
diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue
index 9bc80afae08..c2e8891b9a0 100644
--- a/ui/src/views/compute/KubernetesServiceTab.vue
+++ b/ui/src/views/compute/KubernetesServiceTab.vue
@@ -25,7 +25,7 @@
<a-tab-pane :tab="$t('label.details')" key="details">
<DetailsTab :resource="resource" :loading="loading" />
</a-tab-pane>
- <a-tab-pane v-if="resource.clustertype == 'CloudManaged'" :tab="$t('label.access')" key="access">
+ <a-tab-pane v-if="resource.clustertype === 'CloudManaged'" :tab="$t('label.access')" key="access">
<a-card :title="$t('label.kubeconfig.cluster')" :loading="versionLoading">
<div v-if="clusterConfig !== ''">
<a-textarea :value="clusterConfig" :rows="5" readonly />
@@ -278,7 +278,7 @@ export default {
}
},
mounted () {
- if (this.$store.getters.apis.scaleKubernetesCluster.params.filter(x => x.name === 'nodeids').length > 0) {
+ if (this.$store.getters.apis.scaleKubernetesCluster.params.filter(x => x.name === 'nodeids').length > 0 && this.resource.clustertype === 'CloudManaged') {
this.vmColumns.push({
key: 'actions',
title: this.$t('label.actions'),