CAPZ: Change Helm values structure (#262)

* CAPZ: Change Helm values structure where root-level properties are moved to `.Values.global`. * update cluster values for capz --------- Signed-off-by: Mario Nitchev <[email protected]> Co-authored-by: Mario Nitchev <[email protected]>
giantswarm · Apr 25, 2024 · 829ff39 · 829ff39
1 parent d98f52a
commit 829ff39
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- CAPZ: Change Helm values structure where root-level properties are moved to `.Values.global`.
+
 ## [1.37.0] - 2024-04-19
 
 ### Added

diff --git a/providers/capz/standard/test_data/cluster_values.yaml b/providers/capz/standard/test_data/cluster_values.yaml
@@ -1,16 +1,17 @@
-metadata:
-  name: "{{ .ClusterName }}"
-  description: "E2E Test cluster"
-  organization: "{{ .Organization }}"
-providerSpecific:
-  location: "westeurope"
-  subscriptionId: 6b1f6e4a-6d0e-4aa4-9a5a-fbaca65a23b3
-nodePools:
-# We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
-- name: nodepool-0
-  instanceType: Standard_D4s_v5
-  replicas: 2
-  rootVolumeSizeGB: 50
-connectivity:
-  bastion:
-    enabled: true
+global:
+  metadata:
+    name: "{{ .ClusterName }}"
+    description: "E2E Test cluster"
+    organization: "{{ .Organization }}"
+  providerSpecific:
+    location: "westeurope"
+    subscriptionId: 6b1f6e4a-6d0e-4aa4-9a5a-fbaca65a23b3
+  nodePools:
+  # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
+    nodepool-0:
+      instanceType: Standard_D4s_v5
+      replicas: 2
+      rootVolumeSizeGB: 50
+  connectivity:
+    bastion:
+      enabled: true
diff --git a/providers/capz/upgrade/test_data/cluster_values.yaml b/providers/capz/upgrade/test_data/cluster_values.yaml
@@ -1,16 +1,17 @@
-metadata:
-  name: "{{ .ClusterName }}"
-  description: "E2E Test cluster"
-  organization: "{{ .Organization }}"
-providerSpecific:
-  location: "westeurope"
-  subscriptionId: 6b1f6e4a-6d0e-4aa4-9a5a-fbaca65a23b3
-nodePools:
-# We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
-- name: nodepool-0
-  instanceType: Standard_D4s_v5
-  replicas: 2
-  rootVolumeSizeGB: 50
-connectivity:
-  bastion:
-    enabled: true
+global:
+  metadata:
+    name: "{{ .ClusterName }}"
+    description: "E2E Test cluster"
+    organization: "{{ .Organization }}"
+  providerSpecific:
+    location: "westeurope"
+    subscriptionId: 6b1f6e4a-6d0e-4aa4-9a5a-fbaca65a23b3
+  nodePools:
+  # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
+    nodepool-0:
+      instanceType: Standard_D4s_v5
+      replicas: 2
+      rootVolumeSizeGB: 50
+  connectivity:
+    bastion:
+      enabled: true