From c55035f3a99be52630a780edd0e94c29f884ba0a Mon Sep 17 00:00:00 2001
From: Marlon Etheredge <marlon.etheredge@uibk.ac.at>
Date: Thu, 10 Oct 2024 14:44:39 +0200
Subject: [PATCH] fix: fixing network issues in sample kubernetes configuration

---
 docs/resources/kubernetes-configuration/Vagrantfile  |  1 +
 .../ansible/roles/kubernetes/defaults/main.yml       |  3 +--
 .../roles/kubernetes/tasks/configure_master.yml      | 10 ++--------
 .../roles/kubernetes/tasks/configure_node.yml        | 12 ++++++------
 .../roles/kubernetes/tasks/install_kubernetes.yml    |  8 --------
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/docs/resources/kubernetes-configuration/Vagrantfile b/docs/resources/kubernetes-configuration/Vagrantfile
index 5f910297..897bbf89 100644
--- a/docs/resources/kubernetes-configuration/Vagrantfile
+++ b/docs/resources/kubernetes-configuration/Vagrantfile
@@ -7,6 +7,7 @@ Vagrant.configure("2") do |config|
         master.vm.box = LINUX_BASE_BOX
         master.vm.hostname = "master"
         master.vm.network "private_network", ip: ip
+        master.vm.network "forwarded_port", guest: 6443, host: 6443
 
         master.vm.provider "virtualbox" do |virtualbox|
             virtualbox.customize ["modifyvm", :id, "--cableconnected1", "on", "--audio", "none"]
diff --git a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/defaults/main.yml b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/defaults/main.yml
index f6520cf1..85410e36 100644
--- a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/defaults/main.yml
+++ b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/defaults/main.yml
@@ -10,5 +10,4 @@ clients:
 # NOTE: Replace `Europe/Amsterdam` with your timezone
 local_time_zone: "Europe/Amsterdam"
 
-pod_network: 10.10.0.0/16
-local_network: 10.140.0.0/16
\ No newline at end of file
+local_network: 10.10.0.0/16
\ No newline at end of file
diff --git a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_master.yml b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_master.yml
index 73ced0fd..5bc81319 100644
--- a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_master.yml
+++ b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_master.yml
@@ -15,7 +15,7 @@
 
 - name: Initialize Kubernetes cluster
   become: yes
-  ansible.builtin.shell: "kubeadm init --apiserver-advertise-address={{ node_ip }} --pod-network-cidr={{ pod_network }}"
+  ansible.builtin.shell: "kubeadm init --apiserver-advertise-address={{ node_ip }}"
 
 - name: Create .kube directory
   ansible.builtin.file:
@@ -40,17 +40,11 @@
 
 - name: Download Flannel network plugin
   ansible.builtin.get_url:
-    url: https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
+    url: https://github.com/coreos/flannel/raw/master/Documentation/kube-flannel.yml
     dest: /tmp/kube-flannel.yml
     mode: '0644'
     force: true
 
-- name: Change Pod Network to desired
-  ansible.builtin.replace:
-    path: "/tmp/kube-flannel.yml"
-    regexp: '"Network": "10.244.0.0\/16"'
-    replace: '"Network": "{{ pod_network }}"'
-
 - name: Apply Flannel network plugin
   kubernetes.core.k8s:
     state: present
diff --git a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_node.yml b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_node.yml
index 72e9565a..0b6a9d66 100644
--- a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_node.yml
+++ b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/configure_node.yml
@@ -1,10 +1,4 @@
 ---
-- name: Copy the join command to server location
-  copy: src=join-command dest=/tmp/join-command.sh mode=0777
-
-- name: Join the node to cluster
-  command: sh /tmp/join-command.sh
-
 - name: Change interface to flannel
   ansible.posix.firewalld:
     zone: trusted
@@ -16,3 +10,9 @@
   ansible.builtin.service:
     name: firewalld
     state: reloaded
+
+- name: Copy the join command to server location
+  copy: src=join-command dest=/tmp/join-command.sh mode=0777
+
+- name: Join the node to cluster
+  command: sh /tmp/join-command.sh
diff --git a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/install_kubernetes.yml b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/install_kubernetes.yml
index 7d263ecf..5bf5da2e 100644
--- a/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/install_kubernetes.yml
+++ b/docs/resources/kubernetes-configuration/ansible/roles/kubernetes/tasks/install_kubernetes.yml
@@ -9,7 +9,6 @@
       - curl
       - gpg
       - firewalld
-      - acl
 
 - name: Create directory for apt keyrings
   ansible.builtin.file:
@@ -111,13 +110,6 @@
     state: enabled
     permanent: true
 
-- name: Allow traffic on Pod Network
-  ansible.posix.firewalld:
-    source: "{{ pod_network }}"
-    zone: trusted
-    state: enabled
-    permanent: true
-
 - name: Allow traffic on local Network
   ansible.posix.firewalld:
     source: "{{ local_network }}"