From 06ff1c5353a6389a1a47db514d5381546f0ba20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Prokopi=C4=87?= Date: Tue, 28 Nov 2023 23:17:56 +0100 Subject: [PATCH] Move cluster-aws root-level Helm values to global in capa standard test --- .../standard/test_data/cluster_values.yaml | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/providers/capa/standard/test_data/cluster_values.yaml b/providers/capa/standard/test_data/cluster_values.yaml index 5080d083..c3429069 100644 --- a/providers/capa/standard/test_data/cluster_values.yaml +++ b/providers/capa/standard/test_data/cluster_values.yaml @@ -1,23 +1,24 @@ -metadata: - name: "{{ .ClusterName }}" - description: "E2E Test cluster" - organization: "{{ .Organization }}" +global: + metadata: + name: "{{ .ClusterName }}" + description: "E2E Test cluster" + organization: "{{ .Organization }}" -controlPlane: - containerdVolumeSizeGB: 15 - etcdVolumeSizeGB: 50 - kubeletVolumeSizeGB: 10 - rootVolumeSizeGB: 10 + controlPlane: + containerdVolumeSizeGB: 15 + etcdVolumeSizeGB: 50 + kubeletVolumeSizeGB: 10 + rootVolumeSizeGB: 10 -# 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: - pool0: - maxSize: 2 - minSize: 1 - rootVolumeSizeGB: 25 - spotInstances: - enabled: true - maxPrice: 0.2960 + # 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: + pool0: + maxSize: 2 + minSize: 1 + rootVolumeSizeGB: 25 + spotInstances: + enabled: true + maxPrice: 0.2960