From a3c887748aefc3054869c426415c4827e1cec0c1 Mon Sep 17 00:00:00 2001
From: Ruakij <ruakij@ruekov.eu>
Date: Wed, 5 Apr 2023 20:14:12 +0200
Subject: [PATCH] Move network-helper to own file independend from calico

---
 kubernetes/tasks/install/server/install_k3s.yml               | 4 +++-
 .../tasks/install/server/network-plugin/deploy_calico.yml     | 3 ---
 .../{deploy_calico_helper.yml => deploy_network_helper.yml}   | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename kubernetes/tasks/install/server/network-plugin/{deploy_calico_helper.yml => deploy_network_helper.yml} (84%)

diff --git a/kubernetes/tasks/install/server/install_k3s.yml b/kubernetes/tasks/install/server/install_k3s.yml
index d8d4a75..b397c51 100644
--- a/kubernetes/tasks/install/server/install_k3s.yml
+++ b/kubernetes/tasks/install/server/install_k3s.yml
@@ -49,4 +49,6 @@
 
 - name: Deploy calico
   import_tasks: ./roles/kubernetes/tasks/install/server/network-plugin/deploy_calico.yml
-  when: "kubernetes.network_plugin == 'calico'"
+
+- name: Deploy network-helpers
+  import_tasks: ./roles/kubernetes/tasks/install/server/network-plugin/deploy_network_helper.yml
diff --git a/kubernetes/tasks/install/server/network-plugin/deploy_calico.yml b/kubernetes/tasks/install/server/network-plugin/deploy_calico.yml
index 3491142..da366da 100644
--- a/kubernetes/tasks/install/server/network-plugin/deploy_calico.yml
+++ b/kubernetes/tasks/install/server/network-plugin/deploy_calico.yml
@@ -15,6 +15,3 @@
   register: command
   changed_when: "'created' in command.stdout"
   run_once: true
-
-- name: Deploy calico-helpers
-  import_tasks: ./roles/kubernetes/tasks/install/server/network-plugin/deploy_calico_helper.yml
diff --git a/kubernetes/tasks/install/server/network-plugin/deploy_calico_helper.yml b/kubernetes/tasks/install/server/network-plugin/deploy_network_helper.yml
similarity index 84%
rename from kubernetes/tasks/install/server/network-plugin/deploy_calico_helper.yml
rename to kubernetes/tasks/install/server/network-plugin/deploy_network_helper.yml
index ec8a684..acc3205 100644
--- a/kubernetes/tasks/install/server/network-plugin/deploy_calico_helper.yml
+++ b/kubernetes/tasks/install/server/network-plugin/deploy_network_helper.yml
@@ -4,3 +4,4 @@
     dest: /var/lib/rancher/k3s/server/manifests/routingtabletowg.yml
     mode: u=rw,g=r,o=r
   run_once: true
+  when: "kubernetes.network.helper.routingtabletowg"