From 56235703aed820a6bac389ecea8e864de750eed3 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Wed, 20 Sep 2023 08:32:05 +0200 Subject: [PATCH 1/8] Adapt to meilisearch backup-restore-sidecar support. --- inventories/group_vars/all/images.yaml | 2 +- .../group_vars/control-plane/auditing.yaml | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 86b83341..a2fe14dd 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -24,5 +24,5 @@ metal_stack_release_version: develop ## # ansible_common_version: -# metal_roles_version: +metal_roles_version: migrate-to-meili-backup-restore # metal_ansible_modules_version: diff --git a/inventories/group_vars/control-plane/auditing.yaml b/inventories/group_vars/control-plane/auditing.yaml index a621ec62..fba6950a 100644 --- a/inventories/group_vars/control-plane/auditing.yaml +++ b/inventories/group_vars/control-plane/auditing.yaml @@ -1,13 +1,7 @@ --- -auditing_meili_secret: geheim -auditing_meili_environment: development +auditing_meili_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar +auditing_meili_backup_restore_sidecar_image_tag: meilisearch-support -auditing_meili_ingress: - enabled: true - hosts: - - auditing.{{ metal_control_plane_ingress_dns }} - -auditing_meili_persistence: - enabled: true - size: 10Gi - storageClass: null +auditing_meili_storage_size: 10Gi +auditing_meili_env: production +auditing_meili_resources: {} From e3ac647b00eaf819f9055a175741ed7e44dbc6bb Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Wed, 20 Sep 2023 08:49:33 +0200 Subject: [PATCH 2/8] Move to release vector PR. --- inventories/group_vars/all/images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index a2fe14dd..5e7ea87e 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -1,5 +1,5 @@ --- -metal_stack_release_version: develop +metal_stack_release_version: migrate-to-meili-backup-restore ## ## for development purposes, you can override releases from our image vector here From a859d28563eae40b9d5662acfb528f8bae57d208 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Wed, 20 Sep 2023 08:49:39 +0200 Subject: [PATCH 3/8] Remove overrides. --- inventories/group_vars/control-plane/auditing.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/inventories/group_vars/control-plane/auditing.yaml b/inventories/group_vars/control-plane/auditing.yaml index fba6950a..178e1fea 100644 --- a/inventories/group_vars/control-plane/auditing.yaml +++ b/inventories/group_vars/control-plane/auditing.yaml @@ -1,7 +1,4 @@ --- -auditing_meili_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar -auditing_meili_backup_restore_sidecar_image_tag: meilisearch-support - auditing_meili_storage_size: 10Gi auditing_meili_env: production auditing_meili_resources: {} From 0ac441a3cafcf9b5c4b0aa65917fd732c0a4125e Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Wed, 20 Sep 2023 08:57:07 +0200 Subject: [PATCH 4/8] Adapt. --- inventories/group_vars/control-plane/auditing.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/inventories/group_vars/control-plane/auditing.yaml b/inventories/group_vars/control-plane/auditing.yaml index 178e1fea..6683cd12 100644 --- a/inventories/group_vars/control-plane/auditing.yaml +++ b/inventories/group_vars/control-plane/auditing.yaml @@ -1,4 +1,3 @@ --- auditing_meili_storage_size: 10Gi -auditing_meili_env: production auditing_meili_resources: {} From 9eedc02cf5ae51501b9528c5944ae5a71afb421a Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Wed, 20 Sep 2023 09:05:44 +0200 Subject: [PATCH 5/8] Overrides cannot yet be removed. --- inventories/group_vars/control-plane/auditing.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventories/group_vars/control-plane/auditing.yaml b/inventories/group_vars/control-plane/auditing.yaml index 6683cd12..6dbbce07 100644 --- a/inventories/group_vars/control-plane/auditing.yaml +++ b/inventories/group_vars/control-plane/auditing.yaml @@ -1,3 +1,6 @@ --- +auditing_meili_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar +auditing_meili_backup_restore_sidecar_image_tag: meilisearch-support + auditing_meili_storage_size: 10Gi auditing_meili_resources: {} From 8c2dccd12889a36f6785b6ed1f8fd55f7b14c85d Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 25 Sep 2023 15:46:47 +0200 Subject: [PATCH 6/8] Release vector already merged. --- inventories/group_vars/all/images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index 5e7ea87e..a2fe14dd 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -1,5 +1,5 @@ --- -metal_stack_release_version: migrate-to-meili-backup-restore +metal_stack_release_version: develop ## ## for development purposes, you can override releases from our image vector here From 73994ecd8edb2b30f78e9773928f66478c3ac20e Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 25 Sep 2023 15:47:03 +0200 Subject: [PATCH 7/8] Sidecar now released. --- inventories/group_vars/control-plane/auditing.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/inventories/group_vars/control-plane/auditing.yaml b/inventories/group_vars/control-plane/auditing.yaml index 6dbbce07..6683cd12 100644 --- a/inventories/group_vars/control-plane/auditing.yaml +++ b/inventories/group_vars/control-plane/auditing.yaml @@ -1,6 +1,3 @@ --- -auditing_meili_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar -auditing_meili_backup_restore_sidecar_image_tag: meilisearch-support - auditing_meili_storage_size: 10Gi auditing_meili_resources: {} From b637d2baa870f35cfdea2caeee74729293c6dd32 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Tue, 26 Sep 2023 09:18:07 +0200 Subject: [PATCH 8/8] Remove roles override. --- inventories/group_vars/all/images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml index a2fe14dd..86b83341 100644 --- a/inventories/group_vars/all/images.yaml +++ b/inventories/group_vars/all/images.yaml @@ -24,5 +24,5 @@ metal_stack_release_version: develop ## # ansible_common_version: -metal_roles_version: migrate-to-meili-backup-restore +# metal_roles_version: # metal_ansible_modules_version: