eks-update-global-values (#162)

* eks-update-global-values

* Apply suggestions from code review

Co-authored-by: Jose Armesto <[email protected]>
Signed-off-by: calvix <[email protected]>

---------

Signed-off-by: calvix <[email protected]>
Co-authored-by: Jose Armesto <[email protected]>

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update to new schema for `cluster-eks` values.
+
 ## [1.20.0] - 2023-12-11
 
 ### Changed

providers/eks/standard/test_data/cluster_values.yaml

@@ -1,24 +1,25 @@
-metadata:
-  name: "{{ .ClusterName }}"
-  description: "E2E Test cluster"
-  organization: "{{ .Organization }}"
+global:
+  metadata:
+    name: "{{ .ClusterName }}"
+    description: "E2E Test cluster"
+    organization: "{{ .Organization }}"
 
-controlPlane:
-  # disable logging to save cost
-  logging:
-    apiServer: false
-    audit: false
-    authenticator: false
-    controllerManager: false
+  controlPlane:
+    # disable logging to save cost
+    logging:
+      apiServer: false
+      audit: false
+      authenticator: false
+      controllerManager: false
 
-# We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
-# expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
-# defaulted in the chart template.
-# @TODO: https://github.com/giantswarm/giantswarm/issues/28063
-nodePools:
-  # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
-  nodepool-0:
-    instanceType: r6i.xlarge
-    maxSize: 3
-    minSize: 3
-    rootVolumeSizeGB: 25
+  # We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
+  # expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
+  # defaulted in the chart template.
+  # @TODO: https://github.com/giantswarm/giantswarm/issues/28063
+  nodePools:
+    # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
+    nodepool-0:
+      instanceType: r6i.xlarge
+      maxSize: 3
+      minSize: 3
+      rootVolumeSizeGB: 25

providers/eks/upgrade/test_data/cluster_values.yaml

@@ -1,24 +1,25 @@
-metadata:
-  name: "{{ .ClusterName }}"
-  description: "E2E Test cluster"
-  organization: "{{ .Organization }}"
+global:
+  metadata:
+    name: "{{ .ClusterName }}"
+    description: "E2E Test cluster"
+    organization: "{{ .Organization }}"
 
-controlPlane:
-  # disable logging to save cost
-  logging:
-    apiServer: false
-    audit: false
-    authenticator: false
-    controllerManager: false
+  controlPlane:
+    # disable logging to save cost
+    logging:
+      apiServer: false
+      audit: false
+      authenticator: false
+      controllerManager: false
 
-# We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
-# expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
-# defaulted in the chart template.
-# @TODO: https://github.com/giantswarm/giantswarm/issues/28063
-nodePools:
-  # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
-  nodepool-0:
-    instanceType: r6i.xlarge
-    maxSize: 3
-    minSize: 3
-    rootVolumeSizeGB: 25
+  # We need to pass the node pools otherwise the test called "has all the worker nodes running" will fail because it
+  # expects to find the number of worker nodes in the helm values, but the value is not there if don't pass it, as it's
+  # defaulted in the chart template.
+  # @TODO: https://github.com/giantswarm/giantswarm/issues/28063
+  nodePools:
+    # We are using a name with 10 chars which is the max number of characters allowed by our kyverno policies.
+    nodepool-0:
+      instanceType: r6i.xlarge
+      maxSize: 3
+      minSize: 3
+      rootVolumeSizeGB: 25