From 663c009cf4394dacd96be14812e49e58d303006c Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza Date: Fri, 2 Jul 2021 12:57:55 +0200 Subject: [PATCH] Backup and restore secret type Signed-off-by: Julen Landa Alustiza --- roles/backup/tasks/dump_generated_secret.yml | 3 ++- roles/backup/tasks/dump_secret.yml | 3 ++- roles/restore/templates/secrets.yml.j2 | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/backup/tasks/dump_generated_secret.yml b/roles/backup/tasks/dump_generated_secret.yml index ee6f5fc4..cc25ae23 100644 --- a/roles/backup/tasks/dump_generated_secret.yml +++ b/roles/backup/tasks/dump_generated_secret.yml @@ -29,7 +29,8 @@ - name: Set secret data set_fact: _data: "{{ _secret['resources'][0]['data'] }}" + _type: "{{ _secret['resources'][0]['type'] }}" - name: Create and Add secret names and data to dictionary set_fact: - secret_dict: "{{ secret_dict | default({}) | combine({ item: {'name': _name, 'data': _data }}) }}" + secret_dict: "{{ secret_dict | default({}) | combine({ item: {'name': _name, 'data': _data, 'type': _type }}) }}" diff --git a/roles/backup/tasks/dump_secret.yml b/roles/backup/tasks/dump_secret.yml index bc8ac06c..6b62ffac 100644 --- a/roles/backup/tasks/dump_secret.yml +++ b/roles/backup/tasks/dump_secret.yml @@ -17,8 +17,9 @@ - name: Set secret key set_fact: _data: "{{ _secret['resources'][0]['data'] }}" + _type: "{{ _secret['resources'][0]['type'] }}" - name: Create and Add secret names and data to dictionary set_fact: - secret_dict: "{{ secret_dict | default({}) | combine({item: { 'name': _name, 'data': _data }}) }}" + secret_dict: "{{ secret_dict | default({}) | combine({item: { 'name': _name, 'data': _data, 'type': _type }}) }}" when: _name != '' diff --git a/roles/restore/templates/secrets.yml.j2 b/roles/restore/templates/secrets.yml.j2 index 0b56feb6..ec01eadb 100644 --- a/roles/restore/templates/secrets.yml.j2 +++ b/roles/restore/templates/secrets.yml.j2 @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/managed-by: '{{ deployment_type }}-operator' app.kubernetes.io/component: '{{ deployment_type }}' app.kubernetes.io/operator-version: '{{ lookup("env", "OPERATOR_VERSION") }}' +type: '{{ secrets[secret]['type'] }}' stringData: {% for key, value in secrets[secret]['data'].items() %} {{ key }}: |-