From 3e665a7a5c2fda4a5e5e50cce14d9674293dca3c Mon Sep 17 00:00:00 2001
From: Aumer <aumer@aumer.dev>
Date: Sun, 11 Jun 2023 13:48:09 +0200
Subject: [PATCH 1/5] Remove AnsibleTask no longer in use (#781)

---
 .taskfiles/AnsibleTasks.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.taskfiles/AnsibleTasks.yml b/.taskfiles/AnsibleTasks.yml
index fc677ea2300..97a33e34bc9 100644
--- a/.taskfiles/AnsibleTasks.yml
+++ b/.taskfiles/AnsibleTasks.yml
@@ -63,12 +63,6 @@ tasks:
     cmds:
       - ansible all -i {{.ANSIBLE_INVENTORY_DIR}}/hosts.yml --one-line -a 'uptime'
 
-  rollout-reboot:
-    desc: Rollout a reboot across all the k8s nodes
-    dir: "{{.ANSIBLE_DIR}}"
-    cmds:
-      - ansible-playbook -i {{.ANSIBLE_INVENTORY_DIR}}/hosts.yml {{.ANSIBLE_PLAYBOOK_DIR}}/cluster-rollout-reboot.yml
-
   force-reboot:
     desc: Reboot all the k8s nodes
     dir: "{{.ANSIBLE_DIR}}"

From b5391579795dac3c0173cef56ed1a6e74492be07 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Sun, 11 Jun 2023 20:34:12 -0400
Subject: [PATCH 2/5] fix: use `wait: true` on cilium helmchart removal

---
 ansible/playbooks/cluster-installation.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/playbooks/cluster-installation.yml b/ansible/playbooks/cluster-installation.yml
index b1bd6ec74f3..35d20bf42bd 100644
--- a/ansible/playbooks/cluster-installation.yml
+++ b/ansible/playbooks/cluster-installation.yml
@@ -108,6 +108,7 @@
               - op: add
                 path: /metadata/annotations/helmcharts.helm.cattle.io~1unmanaged
                 value: "true"
+            wait: true
         - name: Remove the Cilium HelmChart CR
           kubernetes.core.k8s:
             kubeconfig: /etc/rancher/k3s/k3s.yaml
@@ -115,6 +116,7 @@
             kind: HelmChart
             namespace: kube-system
             state: absent
+            wait: true
 
     # Cleaning up certain manifests from the /var/lib/rancher/k3s/server/manifests directory
     # is needed because k3s has an awesome "feature" to always re-deploy them when the k3s

From 3116a104294952336c79f609843d8883a2a5845d Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Mon, 12 Jun 2023 19:36:36 -0400
Subject: [PATCH 3/5] fix: k3s not cleaning up the cilium helmchart

---
 ansible/playbooks/cluster-installation.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ansible/playbooks/cluster-installation.yml b/ansible/playbooks/cluster-installation.yml
index 35d20bf42bd..4e46d43a5ce 100644
--- a/ansible/playbooks/cluster-installation.yml
+++ b/ansible/playbooks/cluster-installation.yml
@@ -108,7 +108,6 @@
               - op: add
                 path: /metadata/annotations/helmcharts.helm.cattle.io~1unmanaged
                 value: "true"
-            wait: true
         - name: Remove the Cilium HelmChart CR
           kubernetes.core.k8s:
             kubeconfig: /etc/rancher/k3s/k3s.yaml
@@ -116,7 +115,16 @@
             kind: HelmChart
             namespace: kube-system
             state: absent
-            wait: true
+        - name: Remove finializers on the Cilium HelmChart
+          kubernetes.core.k8s:
+            kubeconfig: /etc/rancher/k3s/k3s.yaml
+            name: cilium
+            kind: HelmChart
+            namespace: kube-system
+            state: patched
+            definition:
+              metadata:
+                finalizers: []
 
     # Cleaning up certain manifests from the /var/lib/rancher/k3s/server/manifests directory
     # is needed because k3s has an awesome "feature" to always re-deploy them when the k3s

From 6b745cdb5ebb56795dd57801441a3007937af45d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 18:02:28 -0400
Subject: [PATCH 4/5] fix(helm): update chart grafana to 6.57.2 (#787)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 kubernetes/apps/monitoring/grafana/app/helmrelease.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
index b84d29c7faa..aebb34df1c4 100644
--- a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
+++ b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: grafana
-      version: 6.57.1
+      version: 6.57.2
       sourceRef:
         kind: HelmRepository
         name: grafana

From 410397525d8247a58dcfd2c41b461f1aaba76eb9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 18:02:35 -0400
Subject: [PATCH 5/5] fix(helm): update chart reloader to 1.0.28 (#788)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 kubernetes/apps/kube-system/reloader/app/helmrelease.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
index 6b5e83ec69e..cf2a54a138d 100644
--- a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: reloader
-      version: 1.0.27
+      version: 1.0.28
       sourceRef:
         kind: HelmRepository
         name: stakater