From 777915b67cb81393d386a616faca443910510da7 Mon Sep 17 00:00:00 2001
From: Simon Weald <7832341+glitchcrab@users.noreply.github.com>
Date: Thu, 16 May 2024 15:48:13 +0100
Subject: [PATCH] update cluster-vsphere values to match refactored chart (#27)

---
 CHANGELOG.md                                  |  4 +
 .../providers/capv/values/cluster_values.yaml | 81 +++++++++----------
 2 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bad3025..ddc9c50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update `cluster-vsphere` values for refactored chart.
+
 ## [1.2.0] - 2024-05-14
 
 ### Changed
diff --git a/pkg/clusterbuilder/providers/capv/values/cluster_values.yaml b/pkg/clusterbuilder/providers/capv/values/cluster_values.yaml
index b6b0972..f68ecc3 100644
--- a/pkg/clusterbuilder/providers/capv/values/cluster_values.yaml
+++ b/pkg/clusterbuilder/providers/capv/values/cluster_values.yaml
@@ -1,48 +1,43 @@
-clusterDescription: "E2E Test cluster"
-organization: "{{ .Organization }}"
-
-baseDomain: test.gigantic.io
-
 global:
   metadata:
+    description: "E2E Test cluster"
+    organization: "{{ .Organization }}"
     labels:
       monitoring.giantswarm.io/prometheus-volume-size: small
-
-controlPlane:
-  replicas: 1
-  image:
-    repository: registry.k8s.io
-  machineTemplate:
-    cloneMode: "linkedClone"
-    diskGiB: 50
-    numCPUs: 4
-    memoryMiB: 8096
-    resourcePool: "grasshopper"
+  connectivity:
     network:
-      devices:
-      - networkName: 'grasshopper-capv'
-        dhcp4: true
-
-connectivity:
-  network:
-    controlPlaneEndpoint:
-      ipPoolName: "wc-cp-ips"  # [string] Ip for control plane will be drawn from this GlobalInClusterIPPool (for gcapeverde it's 10.10.222.232 - 10.10.222.238 inclusive)
-    loadBalancers:
-      ipPoolName: "svc-lb-ips" # [string] Ip for control plane will be drawn from this GlobalInClusterIPPool (for gcapeverde it's 10.10.222.245 - 10.10.222.249 inclusive)
-
-nodeClasses:
-  default:
-    cloneMode: "linkedClone"
-    diskGiB: 50
-    numCPUs: 6
-    memoryMiB: 16896
-    resourcePool: "grasshopper"
-    network:
-      devices:
-      - networkName: 'grasshopper-capv'
-        dhcp4: true
-
-nodePools:
-  worker:
-    class: "default"
-    replicas: 2
+      controlPlaneEndpoint:
+        ipPoolName: "wc-cp-ips" # [string] Ip for control plane will be drawn from this GlobalInClusterIPPool (for gcapeverde it's 10.10.222.232 - 10.10.222.238 inclusive)
+      loadBalancers:
+        ipPoolName: "svc-lb-ips" # [string] Ip for control plane will be drawn from this GlobalInClusterIPPool (for gcapeverde it's 10.10.222.245 - 10.10.222.249 inclusive)
+    baseDomain: test.gigantic.io
+  controlPlane:
+    replicas: 1
+    image:
+      repository: registry.k8s.io
+    machineTemplate:
+      cloneMode: "linkedClone"
+      diskGiB: 50
+      numCPUs: 4
+      memoryMiB: 8196
+      resourcePool: "grasshopper"
+      network:
+        devices:
+          - networkName: 'grasshopper-capv'
+            dhcp4: true
+    resourceRatio: 8
+  nodePools:
+    worker:
+      class: "default"
+      replicas: 2
+  nodeClasses:
+    default:
+      cloneMode: "linkedClone"
+      diskGiB: 50
+      numCPUs: 6
+      memoryMiB: 16896
+      resourcePool: "grasshopper"
+      network:
+        devices:
+          - networkName: 'grasshopper-capv'
+            dhcp4: true