From aa86dfb5eb7edf852c5084244b9c3a5d71cf864c Mon Sep 17 00:00:00 2001 From: Gerrit Date: Tue, 9 Jul 2024 11:00:17 +0200 Subject: [PATCH] Allow providing metal-stack release version. (#289) --- control-plane/roles/metal/README.md | 1 + control-plane/roles/metal/defaults/main/main.yaml | 1 + control-plane/roles/metal/templates/metal-values.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/control-plane/roles/metal/README.md b/control-plane/roles/metal/README.md index 39f88be8..6e7eb92c 100644 --- a/control-plane/roles/metal/README.md +++ b/control-plane/roles/metal/README.md @@ -94,6 +94,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya | metal_api_s3_secret | | The secret of the S3 server that serves firmwares | | metal_api_s3_firmware_bucket | | The S3 bucket name that contains the firmwares | | metal_api_password_reason_minlength | | If machine console password is requested this defines if and how long the given reason must be | +| metal_api_release_version | | The release version of metal-stack | | minimum_client_version | | minimum metalctl version which is required to talk to this metal-api instance | ### masterdata-api diff --git a/control-plane/roles/metal/defaults/main/main.yaml b/control-plane/roles/metal/defaults/main/main.yaml index 08813d8c..9d47129e 100644 --- a/control-plane/roles/metal/defaults/main/main.yaml +++ b/control-plane/roles/metal/defaults/main/main.yaml @@ -60,6 +60,7 @@ metal_api_s3_key: metal_api_s3_secret: metal_api_s3_firmware_bucket: metal_api_password_reason_minlength: +metal_api_release_version: "{{ metal_stack_release_version }}" minimum_client_version: "{{ metalctl_version }}" # masterdata-api diff --git a/control-plane/roles/metal/templates/metal-values.j2 b/control-plane/roles/metal/templates/metal-values.j2 index 25c475f5..e825a1c1 100644 --- a/control-plane/roles/metal/templates/metal-values.j2 +++ b/control-plane/roles/metal/templates/metal-values.j2 @@ -111,6 +111,7 @@ metal_api: view_key: "{{ metal_api_view_key }}" edit_key: "{{ metal_api_edit_key }}" admin_key: "{{ metal_api_admin_key }}" + release_version: "{{ metal_api_release_version }}" minimum_client_version: "{{ metalctl_version }}" {% if metal_api_password_reason_minlength %} password_reason_minlength: "{{ metal_api_password_reason_minlength }}"