From 8b6467014627390a25233165fa6891892c346a49 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 29 Sep 2021 20:24:00 -0400 Subject: [PATCH] Work around bug in k8s module with the "template" attribute --- roles/backup/tasks/error_handling.yml | 2 +- roles/backup/tasks/init.yml | 4 ++-- roles/restore/tasks/error_handling.yml | 2 +- roles/restore/tasks/init.yml | 2 +- roles/restore/tasks/secrets.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/backup/tasks/error_handling.yml b/roles/backup/tasks/error_handling.yml index 679f1cea..bc881b45 100644 --- a/roles/backup/tasks/error_handling.yml +++ b/roles/backup/tasks/error_handling.yml @@ -8,4 +8,4 @@ k8s: kind: Event namespace: "{{ ansible_operator_meta.namespace }}" - template: "event.yml.j2" + definition: "{{ lookup('template', 'event.yml.j2') }}" diff --git a/roles/backup/tasks/init.yml b/roles/backup/tasks/init.yml index 2806a401..65e6e92f 100644 --- a/roles/backup/tasks/init.yml +++ b/roles/backup/tasks/init.yml @@ -49,7 +49,7 @@ - name: Create PVC for backup k8s: kind: PersistentVolumeClaim - template: "backup_pvc.yml.j2" + definition: "{{ lookup('template', 'backup_pvc.yml.j2') }}" - name: Remove PVC ownerReference k8s: @@ -68,7 +68,7 @@ name: "{{ ansible_operator_meta.name }}-db-management" kind: Deployment state: present - template: "management-pod.yml.j2" + definition: "{{ lookup('template', 'management-pod.yml.j2') }}" wait: true - name: Look up details for this deployment diff --git a/roles/restore/tasks/error_handling.yml b/roles/restore/tasks/error_handling.yml index 679f1cea..bc881b45 100644 --- a/roles/restore/tasks/error_handling.yml +++ b/roles/restore/tasks/error_handling.yml @@ -8,4 +8,4 @@ k8s: kind: Event namespace: "{{ ansible_operator_meta.namespace }}" - template: "event.yml.j2" + definition: "{{ lookup('template', 'event.yml.j2') }}" diff --git a/roles/restore/tasks/init.yml b/roles/restore/tasks/init.yml index be5bc387..146b2ea8 100644 --- a/roles/restore/tasks/init.yml +++ b/roles/restore/tasks/init.yml @@ -76,7 +76,7 @@ name: "{{ ansible_operator_meta.name }}-db-management" kind: Deployment state: present - template: "management-pod.yml.j2" + definition: "{{ lookup('template', 'management-pod.yml.j2') }}" wait: true - name: Check to make sure backup directory exists on PVC diff --git a/roles/restore/tasks/secrets.yml b/roles/restore/tasks/secrets.yml index b1de1648..942b8b6f 100644 --- a/roles/restore/tasks/secrets.yml +++ b/roles/restore/tasks/secrets.yml @@ -60,7 +60,7 @@ namespace: "{{ ansible_operator_meta.namespace }}" apply: yes wait: yes - template: "secrets.yml.j2" + definition: "{{ lookup('template', 'secrets.yml.j2') }}" no_log: true - name: Remove ownerReference on restored secrets