From 32ab694fd6f7f246fd473b3e29636df55f6884db Mon Sep 17 00:00:00 2001 From: Gerrit Date: Wed, 25 Sep 2024 11:27:55 +0200 Subject: [PATCH] Adapt to latest size reservations API. --- control-plane/roles/metal/README.md | 3 ++- control-plane/roles/metal/defaults/main/main.yaml | 1 + control-plane/roles/metal/templates/metal-values.j2 | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/control-plane/roles/metal/README.md b/control-plane/roles/metal/README.md index f6ca6f12..849857df 100644 --- a/control-plane/roles/metal/README.md +++ b/control-plane/roles/metal/README.md @@ -54,7 +54,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya ### metal-api | Name | Mandatory | Description | -|-------------------------------------|-----------|------------------------------------------------------------------------------------------------| +| ----------------------------------- | --------- | ---------------------------------------------------------------------------------------------- | | metal_api_replicas | | The number of deployed replicas of the metal-api | | metal_api_hpa_enabled | | Enables horizontal pod autoscaling for the metal-api | | metal_api_hpa_max | | Max amount of replicas for the HPA of the metal-api | @@ -85,6 +85,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya | metal_api_ips | | Creates ips (as masterdata) to the metal-api after deployment | | metal_api_filesystemlayouts | | Creates filesystemlayouts to the metal-api after deployment | | metal_api_sizeimageconstraints | | Creates sizeimageconstraints to the metal-api after deployment | +| metal_api_size_reservations | | Creates size reservations to the metal-api after deployment | | metal_api_resources | | Sets the given container resources | | metal_api_bmc_superuser_enabled | | Enables creating the BMC superuser and disabling the default one | | metal_api_bmc_superuser_pwd | | If enabled use this password for the new BMC superuser | diff --git a/control-plane/roles/metal/defaults/main/main.yaml b/control-plane/roles/metal/defaults/main/main.yaml index b3efe59a..0f1077f9 100644 --- a/control-plane/roles/metal/defaults/main/main.yaml +++ b/control-plane/roles/metal/defaults/main/main.yaml @@ -53,6 +53,7 @@ metal_api_networks: [] metal_api_ips: [] metal_api_filesystemlayouts: [] metal_api_sizeimageconstraints: [] +metal_api_size_reservations: [] metal_api_resources: metal_api_s3_enabled: false metal_api_s3_address: diff --git a/control-plane/roles/metal/templates/metal-values.j2 b/control-plane/roles/metal/templates/metal-values.j2 index 7321a954..90bbad73 100644 --- a/control-plane/roles/metal/templates/metal-values.j2 +++ b/control-plane/roles/metal/templates/metal-values.j2 @@ -160,10 +160,6 @@ metal_api: filesystemlayouts: | {% for entity in metal_api_filesystemlayouts %} --- - {# - Some FSL Types confuse different YAML-parsing implementations. - Hence we fall back to JSON to enforce quotes around literals like 8e00. - #} {{ entity | to_json | indent(width=4, first=false) }} {% endfor %} sizeimageconstraints: | @@ -171,6 +167,11 @@ metal_api: --- {{ entity | to_json | indent(width=4, first=false) }} {% endfor %} + size_reservations: | +{% for entity in metal_api_size_reservations %} + --- + {{ entity | to_json | indent(width=4, first=false) }} +{% endfor %} masterdata_api: provider_tenant: {{ metal_masterdata_api_provider_tenant }}