From a405544b4b517f09d1dcd8605c40207bdb552e00 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Mon, 28 Sep 2020 15:57:40 +0530 Subject: [PATCH 1/5] Fixing instance view --- src/views/compute/KubernetesServiceTab.vue | 34 ++++------------------ 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue index d78775ef7..434f51f59 100644 --- a/src/views/compute/KubernetesServiceTab.vue +++ b/src/views/compute/KubernetesServiceTab.vue @@ -286,35 +286,13 @@ export default { }, fetchInstances () { this.instanceLoading = true - this.virtualmachines = [] - if (!this.isObjectEmpty(this.resource) && this.arrayHasItems(this.resource.virtualmachineids)) { - var params = {} - if (this.isAdminOrDomainAdmin()) { - params.listall = true + this.virtualmachines = this.resource.virtualmachines + this.virtualmachines.map(vm => { + if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) { + vm.ipaddress = vm.nic[0].ipaddress } - if (this.isValidValueForKey(this.resource, 'projectid') && - this.resource.projectid !== '') { - params.projectid = this.resource.projectid - } - params.ids = this.resource.virtualmachineids.join() - api('listVirtualMachines', params).then(json => { - const listVms = json.listvirtualmachinesresponse.virtualmachine - if (this.arrayHasItems(listVms)) { - for (var i = 0; i < listVms.length; ++i) { - var vm = listVms[i] - if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) { - vm.ipaddress = vm.nic[0].ipaddress - listVms[i] = vm - } - } - this.virtualmachines = this.virtualmachines.concat(listVms) - } - }).catch(error => { - this.$notifyError(error) - }).finally(() => { - this.instanceLoading = false - }) - } + }) + this.instanceLoading = false }, fetchPublicIpAddress () { this.networkLoading = true From 8055d06da72a5444da20de4d6cb317a6ed178b39 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Wed, 28 Oct 2020 18:03:36 +0530 Subject: [PATCH 2/5] Chaning from ip to ssh port --- src/locales/en.json | 1 + src/views/compute/KubernetesServiceTab.vue | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 922dda58b..7eaf7d0fd 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1966,6 +1966,7 @@ "label.srx.firewall": "Juniper SRX Firewall", "label.ssh.key.pair.details": "SSH Key Pair Details", "label.ssh.key.pairs": "SSH Key Pairs", +"label.ssh.port": "SSH Port", "label.sshkeypair": "New SSH Key Pair", "label.sshkeypairs": "SSH keypairs", "label.sslcertificates": "SSL Certificates", diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue index 434f51f59..15d643ee6 100644 --- a/src/views/compute/KubernetesServiceTab.vue +++ b/src/views/compute/KubernetesServiceTab.vue @@ -106,6 +106,9 @@ + @@ -165,7 +168,8 @@ export default { networkLoading: false, network: {}, publicIpAddress: {}, - currentTab: 'details' + currentTab: 'details', + cksSshStartingPort: 2222 } }, created () { @@ -185,8 +189,9 @@ export default { dataIndex: 'instancename' }, { - title: this.$t('label.ipaddress'), - dataIndex: 'ipaddress' + title: this.$t('label.ssh.port'), + dataIndex: 'port', + scopedSlots: { customRender: 'port' } }, { title: this.$t('label.zonename'), From fff5c4459c2cb8f6bd04e402210633bf1af54d8b Mon Sep 17 00:00:00 2001 From: davidjumani Date: Mon, 28 Sep 2020 15:57:23 +0530 Subject: [PATCH 3/5] Fixing html tags in text --- src/locales/en.json | 6 +++--- src/views/compute/KubernetesServiceTab.vue | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 7eaf7d0fd..c1140bb34 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -793,8 +793,8 @@ "label.done": "Done", "label.double.quotes.are.not.allowed": "Double quotes are not allowed", "label.download": "Download", -"label.download.kubeconfig.cluster": "Download kubeconfig for the cluster

The kubectl command-line tool uses kubeconfig files to find the information it needs to choose a cluster and communicate with the API server of a cluster.", -"label.download.kubectl": "Download kubectl tool for cluster's Kubernetes version", +"label.download.kubeconfig.cluster": "Download kubeconfig for the cluster

The kubectl command-line tool uses kubeconfig files to find the information it needs to choose a cluster and communicate with the API server of a cluster.", +"label.download.kubectl": "Download kubectl tool for cluster's Kubernetes version", "label.download.kubernetes.cluster.config": "Download Kubernetes cluster config", "label.download.progress": "Download Progress", "label.dpd": "Dead Peer Detection", @@ -2148,7 +2148,7 @@ "label.usageinterface": "Usage Interface", "label.usagename": "Usage Type", "label.usageunit": "Unit", -"label.use.kubectl.access.cluster": "Use kubectl and kubeconfig file to access cluster", +"label.use.kubectl.access.cluster": "kubectl and kubeconfig file to access cluster", "label.use.vm.ip": "Use VM IP:", "label.use.vm.ips": "Use VM IPs", "label.used": "Used", diff --git a/src/views/compute/KubernetesServiceTab.vue b/src/views/compute/KubernetesServiceTab.vue index 15d643ee6..c1d9698cf 100644 --- a/src/views/compute/KubernetesServiceTab.vue +++ b/src/views/compute/KubernetesServiceTab.vue @@ -40,23 +40,21 @@ -

- {{ $t('label.download.kubeconfig.cluster') }} +

+

- {{ $t('label.download.kubectl') }}

{{ $t('label.linux') }}: {{ this.kubectlLinuxLink }}
{{ $t('label.macos') }}: {{ this.kubectlMacLink }}
{{ $t('label.windows') }}: {{ this.kubectlWindowsLink }}

+

- {{ $t('label.use.kubectl.access.cluster') }}

kubectl --kubeconfig /custom/path/kube.conf {COMMAND}

- {{ $t('label.list.pods') }}
kubectl --kubeconfig /custom/path/kube.conf get pods --all-namespaces
{{ $t('label.list.nodes') }}
From 6cbe5126ba195ac2bd1b9c473fcb6b5330192420 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Wed, 28 Oct 2020 18:13:02 +0530 Subject: [PATCH 4/5] Adding messages to kube actions --- src/config/section/compute.js | 5 +++++ src/locales/en.json | 5 +++++ src/views/compute/ScaleKubernetesCluster.vue | 4 ++++ src/views/compute/UpgradeKubernetesCluster.vue | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/src/config/section/compute.js b/src/config/section/compute.js index d6a4fb9ba..d485772e2 100644 --- a/src/config/section/compute.js +++ b/src/config/section/compute.js @@ -432,6 +432,7 @@ export default { api: 'startKubernetesCluster', icon: 'caret-right', label: 'label.kubernetes.cluster.start', + message: 'message.kubernetes.cluster.start', docHelp: 'plugins/cloudstack-kubernetes-service.html#starting-a-stopped-kubernetes-cluster', dataView: true, show: (record) => { return ['Stopped'].includes(record.state) } @@ -440,6 +441,7 @@ export default { api: 'stopKubernetesCluster', icon: 'poweroff', label: 'label.kubernetes.cluster.stop', + message: 'message.kubernetes.cluster.stop', docHelp: 'plugins/cloudstack-kubernetes-service.html#stopping-kubernetes-cluster', dataView: true, show: (record) => { return !['Stopped', 'Destroyed', 'Destroying'].includes(record.state) } @@ -448,6 +450,7 @@ export default { api: 'scaleKubernetesCluster', icon: 'swap', label: 'label.kubernetes.cluster.scale', + message: 'message.kubernetes.cluster.scale', docHelp: 'plugins/cloudstack-kubernetes-service.html#scaling-kubernetes-cluster', dataView: true, show: (record) => { return ['Created', 'Running'].includes(record.state) }, @@ -458,6 +461,7 @@ export default { api: 'upgradeKubernetesCluster', icon: 'plus-circle', label: 'label.kubernetes.cluster.upgrade', + message: 'message.kubernetes.cluster.upgrade', docHelp: 'plugins/cloudstack-kubernetes-service.html#upgrading-kubernetes-cluster', dataView: true, show: (record) => { return ['Created', 'Running'].includes(record.state) }, @@ -468,6 +472,7 @@ export default { api: 'deleteKubernetesCluster', icon: 'delete', label: 'label.kubernetes.cluster.delete', + message: 'message.kubernetes.cluster.delete', docHelp: 'plugins/cloudstack-kubernetes-service.html#deleting-kubernetes-cluster', dataView: true, show: (record) => { return !['Destroyed', 'Destroying'].includes(record.state) } diff --git a/src/locales/en.json b/src/locales/en.json index c1140bb34..096355312 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -2892,6 +2892,11 @@ "message.iso.desc": "Disc image containing data or bootable media for OS", "message.join.project": "You have now joined a project. Please switch to Project view to see the project.", "message.kubeconfig.cluster.not.available": "Kubernetes cluster kubeconfig not available currently", +"message.kubernetes.cluster.delete": "Please confirm that you want to destroy the cluster", +"message.kubernetes.cluster.scale": "Please select desired cluster configuration", +"message.kubernetes.cluster.start": "Please confirm that you want to start the cluster", +"message.kubernetes.cluster.stop": "Please confirm that you want to stop the cluster", +"message.kubernetes.cluster.upgrade": "Please select new kubernetes version", "message.launch.vm.on.private.network": "Do you wish to launch your instance on your own private dedicated network?", "message.launch.zone": "Zone is ready to launch; please proceed to the next step.", "message.launch.zone.description": "Zone is ready to launch; please proceed to the next step.", diff --git a/src/views/compute/ScaleKubernetesCluster.vue b/src/views/compute/ScaleKubernetesCluster.vue index 4dc11b9b2..8ebc1fb29 100644 --- a/src/views/compute/ScaleKubernetesCluster.vue +++ b/src/views/compute/ScaleKubernetesCluster.vue @@ -18,6 +18,10 @@