From 458628d239e821571472caab3b83b550e85ef491 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@tromso.serit.no>
Date: Mon, 19 Apr 2021 21:03:30 +0200
Subject: [PATCH] Add zap scripts, and make restart scripts more explicit

---
 scripts/restart-flannel.sh    | 6 ++++--
 scripts/restart-kubernetes.sh | 8 +++++---
 scripts/zap-crashing-pods.sh  | 3 +++
 scripts/zap-evicted-pods.sh   | 3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100755 scripts/zap-crashing-pods.sh
 create mode 100755 scripts/zap-evicted-pods.sh

diff --git a/scripts/restart-flannel.sh b/scripts/restart-flannel.sh
index 79e6278..74b4c55 100755
--- a/scripts/restart-flannel.sh
+++ b/scripts/restart-flannel.sh
@@ -3,8 +3,10 @@
 master="etcd.service"
 node="flannel.service"
 
-nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
-master_node=$(echo $nodes | cut -d' ' -f1)
+nodes="@nodes@"
+master_node="@master@"
+# nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
+# master_node=$(echo $nodes | cut -d' ' -f1)
 
 echo "$master_node: systemctl restart $master"
 sudo systemctl restart $master
diff --git a/scripts/restart-kubernetes.sh b/scripts/restart-kubernetes.sh
index 7f91d2c..2b04d8c 100755
--- a/scripts/restart-kubernetes.sh
+++ b/scripts/restart-kubernetes.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
-master="kube-apiserver kube-scheduler kube-controller-manager"
+master="etcd kube-apiserver kube-scheduler kube-controller-manager kube-addon-manager"
 node="kube-proxy kubelet kube-certmgr-apitoken-bootstrap"
 
-nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
-master_node=$(echo $nodes | cut -d' ' -f1)
+nodes="@nodes@"
+master_node="@master@"
+# nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
+# master_node=$(echo $nodes | cut -d' ' -f1)
 
 echo "$master_node: systemctl restart $master"
 sudo systemctl restart $master
diff --git a/scripts/zap-crashing-pods.sh b/scripts/zap-crashing-pods.sh
new file mode 100755
index 0000000..b41cff3
--- /dev/null
+++ b/scripts/zap-crashing-pods.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+for i in (kubectl get pods -A |grep CrashLoop | sed 's/^\([^ ]\+\) \+\([^ ]\+\) .*/kubectl delete pod -n \1 \2 --force=true/'); eval $i; end
diff --git a/scripts/zap-evicted-pods.sh b/scripts/zap-evicted-pods.sh
new file mode 100755
index 0000000..5cf6027
--- /dev/null
+++ b/scripts/zap-evicted-pods.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+ kc delete pods --field-selector 'status.phase==Failed' -A