feat: move sops rename/restore to a ansible task

Signed-off-by: Devin Buhl <devin@buhl.casa>

bootstrap/tasks/addons/csi_driver_nfs.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/grafana.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/hajimari.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/kube_prometheus_stack.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/kubernetes_dashboard.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/system_upgrade_controller.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/addons/weave_gitops.yaml

@@ -23,15 +23,9 @@
 # https://github.com/ansible-collections/community.sops/issues/153
 - name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -42,22 +36,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/ansible/main.yaml

@@ -15,18 +15,11 @@
     mode: "0644"
   with_community.general.filetree: ["../templates/ansible/"]
 
-# https://github.com/ansible-collections/community.sops/issues/153
 - name: Template Ansible encrypted files
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template Ansible encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -47,22 +40,10 @@
       loop: "{{ bootstrap_nodes.master + bootstrap_nodes.worker | default([]) }}"
       loop_control:
         label: "{{ item.address }}"
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/kubernetes/main.yaml

@@ -15,18 +15,11 @@
     mode: "0644"
   with_community.general.filetree: ["../templates/kubernetes/"]
 
-# https://github.com/ansible-collections/community.sops/issues/153
 - name: Template Kubernetes encrypted files
   block:
-    - name: Rename Sops configuration file
+    - name: Disable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml"
+        file: ../sops/disable.yaml
-        dest: "{{ repository_path }}/.sops.yaml.orig"
-        mode: "0644"
-    - name: Remove Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml"
-        state: absent
     - name: Template Kubernetes encrypted files
       when: item.state == 'file' and 'sops' in item.path
       community.sops.sops_encrypt:
@@ -37,22 +30,10 @@
         mode: "0644"
         force: true
       with_community.general.filetree: ["../templates/kubernetes/"]
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent
   rescue:
-    - name: Restore Sops configuration file
+    - name: Enable Sops config
-      ansible.builtin.copy:
+      ansible.builtin.include_tasks:
-        src: "{{ repository_path }}/.sops.yaml.orig"
+        file: ../sops/enable.yaml
-        dest: "{{ repository_path }}/.sops.yaml"
-        mode: "0644"
-    - name: Remove backed up Sops configuration file
-      ansible.builtin.file:
-        path: "{{ repository_path }}/.sops.yaml.orig"
-        state: absent

bootstrap/tasks/sops/disable.yaml

@@ -0,0 +1,12 @@
+---
+# https://github.com/ansible-collections/community.sops/issues/153
+- name: Rename Sops configuration file
+  ansible.builtin.copy:
+    src: "{{ repository_path }}/.sops.yaml"
+    dest: "{{ repository_path }}/.sops.yaml.orig"
+    mode: "0644"
+
+- name: Remove Sops configuration file
+  ansible.builtin.file:
+    path: "{{ repository_path }}/.sops.yaml"
+    state: absent

bootstrap/tasks/sops/enable.yaml

@@ -0,0 +1,12 @@
+---
+# https://github.com/ansible-collections/community.sops/issues/153
+- name: Restore Sops configuration file
+  ansible.builtin.copy:
+    src: "{{ repository_path }}/.sops.yaml.orig"
+    dest: "{{ repository_path }}/.sops.yaml"
+    mode: "0644"
+
+- name: Remove backed up Sops configuration file
+  ansible.builtin.file:
+    path: "{{ repository_path }}/.sops.yaml.orig"
+    state: absent