Merge branch 'cluster-list-show-cpu' into 'master'

Show cpu on clusters list

See merge request gitlab-org/gitlab!26783

app/assets/javascripts/clusters_list/components/clusters.vue

@@ -27,6 +27,10 @@ export default {
       key: 'size',
       label: __('Size'),
     },
+    {
+      key: 'cpu',
+      label: __('Total cores (vCPUs)'),
+    },
     {
       key: 'memory',
       label: __('Total memory (GB)'),

locale/gitlab.pot

@@ -20864,6 +20864,9 @@ msgstr ""
 msgid "Total artifacts size: %{total_size}"
 msgstr ""
 
+msgid "Total cores (vCPUs)"
+msgstr ""
+
 msgid "Total issues"
 msgstr ""
 

spec/frontend/clusters_list/mock_data.js

@@ -5,6 +5,7 @@ export default [
     size: '3',
     clusterType: 'group_type',
     status: 'disabled',
+    cpu: '6 (100% free)',
     memory: '22.50 (30% free)',
   },
   {
@@ -13,6 +14,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'unreachable',
+    cpu: '3 (50% free)',
     memory: '11 (60% free)',
   },
   {
@@ -21,6 +23,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'authentication_failure',
+    cpu: '1 (0% free)',
     memory: '22 (33% free)',
   },
   {
@@ -29,6 +32,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'deleting',
+    cpu: '6 (100% free)',
     memory: '45 (15% free)',
   },
   {
@@ -37,6 +41,7 @@ export default [
     size: '12',
     clusterType: 'project_type',
     status: 'connected',
+    cpu: '6 (100% free)',
     memory: '20.12 (35% free)',
   },
 ];