From f10ca0bcba5b20fc87478d84ca185c63d6085b68 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Wed, 14 Dec 2022 04:19:45 -0500
Subject: [PATCH] Remove swap and ufw options (#554)

* remove options from playbook

* remove options from vars

* prom file names
---
 .../inventory/group_vars/kubernetes/k3s.yml      | 16 ++++++++--------
 .../inventory/group_vars/kubernetes/os.yml       |  2 --
 provision/ansible/playbooks/cluster-prepare.yml  |  9 ++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/provision/ansible/inventory/group_vars/kubernetes/k3s.yml b/provision/ansible/inventory/group_vars/kubernetes/k3s.yml
index 6a33136f..bc7aa023 100644
--- a/provision/ansible/inventory/group_vars/kubernetes/k3s.yml
+++ b/provision/ansible/inventory/group_vars/kubernetes/k3s.yml
@@ -34,21 +34,21 @@ k3s_server_manifests_urls:
     filename: tigera-operator.yaml
   # Prometheus Operator
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
-    filename: monitoring.coreos.com_alertmanagerconfigs.yaml
+    filename: alertmanagerconfigs.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
-    filename: monitoring.coreos.com_alertmanagers.yaml
+    filename: alertmanagers.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
-    filename: monitoring.coreos.com_podmonitors.yaml
+    filename: podmonitors.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
-    filename: monitoring.coreos.com_probes.yaml
+    filename: probes.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
-    filename: monitoring.coreos.com_prometheuses.yaml
+    filename: prometheuses.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
-    filename: monitoring.coreos.com_prometheusrules.yaml
+    filename: prometheusrules.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
-    filename: monitoring.coreos.com_servicemonitors.yaml
+    filename: servicemonitors.yaml
   - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.60.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
-    filename: monitoring.coreos.com_thanosrulers.yaml
+    filename: thanosrulers.yaml
 
 # (list) A flat list of templates to deploy on the primary control plane
 # /var/lib/rancher/k3s/server/manifests
diff --git a/provision/ansible/inventory/group_vars/kubernetes/os.yml b/provision/ansible/inventory/group_vars/kubernetes/os.yml
index 29bbf751..7d5fd602 100644
--- a/provision/ansible/inventory/group_vars/kubernetes/os.yml
+++ b/provision/ansible/inventory/group_vars/kubernetes/os.yml
@@ -22,8 +22,6 @@ fedora:
     - python3-pyyaml
 
 ubuntu:
-  # disable_ufw: true
-  # disable_swap: true
   packages:
     - hdparm
     - htop
diff --git a/provision/ansible/playbooks/cluster-prepare.yml b/provision/ansible/playbooks/cluster-prepare.yml
index ba1bfd4b..4f23d7d1 100644
--- a/provision/ansible/playbooks/cluster-prepare.yml
+++ b/provision/ansible/playbooks/cluster-prepare.yml
@@ -69,9 +69,7 @@
             enabled: false
             masked: true
             state: stopped
-          when:
-            - ansible_facts['distribution'] == 'Ubuntu'
-            - "{{ ubuntu.disable_ufw | default true }}" == true
+          when: ansible_facts['distribution'] == 'Ubuntu'
         - name: System Configuration (1) | Enable fstrim
           ansible.builtin.systemd:
             service: fstrim.timer
@@ -116,7 +114,6 @@
           ansible.builtin.command: swapoff -a
           when:
             - ansible_facts['distribution'] == 'Ubuntu'
-            - "{{ ubuntu.disable_swap | default true }}" == true
             - ansible_swaptotal_mb > 0
         - name: System Configuration (2) | Disable swap at boot | Ubuntu
           ansible.posix.mount:
@@ -124,9 +121,7 @@
             fstype: swap
             state: absent
             loop: ["none", "swap"]
-          when:
-            - ansible_facts['distribution'] == 'Ubuntu'
-            - "{{ ubuntu.disable_swap | default true }}" == true
+          when: ansible_facts['distribution'] == 'Ubuntu'
         - name: System Configuration (2) | Permissive SELinux | Fedora
           ansible.posix.selinux:
             state: permissive