From ce838f5bcb8c760d33cb9d7a59e3a83c58eb0a33 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Tue, 5 Sep 2023 19:35:41 +0200
Subject: [PATCH] feat: working flannel, nginx

---
 get_kube_conf.sh                  |  2 +-
 hosts                             |  3 +--
 playbook.yaml                     | 11 ++++-------
 rootfs/etc/cni/net.d/10-crio.conf |  4 ----
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 rootfs/etc/cni/net.d/10-crio.conf

diff --git a/get_kube_conf.sh b/get_kube_conf.sh
index 5417ef0..bf23ca2 100644
--- a/get_kube_conf.sh
+++ b/get_kube_conf.sh
@@ -1 +1 @@
-ssh debian@vps-sbg-10.maby.dev sudo cat /etc/kubernetes/admin.conf > f.conf
+ssh debian@vps-gra-k8s10.gmoker.com sudo cat /etc/kubernetes/admin.conf > f.conf
diff --git a/hosts b/hosts
index 2bcc045..280c978 100644
--- a/hosts
+++ b/hosts
@@ -1,2 +1 @@
-debian@vps-sbg-10.maby.dev
-debian@vps-gra-10.maby.dev
+debian@vps-gra-k8s10.gmoker.com
diff --git a/playbook.yaml b/playbook.yaml
index 0829ff2..dba7bd3 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -34,7 +34,7 @@
   - name: Upgrade
     apt:
       update_cache: true
-      cache_valid_time: 604800 # 60s * 60m * 24h * 7d
+      cache_valid_time: 86400 # 60s * 60m * 24h
       upgrade: dist
       autoremove: true
       purge: true
@@ -51,7 +51,6 @@
   - name: Install deps
     apt:
       name:
-        - conntrack
         - gpg
         - kubectx
         - vim
@@ -107,16 +106,14 @@
     service:
       name: crio.service
       enabled: true
-  - name: Remove conflicting CRI-O network config
-    file:
-      path: /etc/cni/net.d/100-crio-bridge.conf
-      state: absent
   - name: Reboot
     reboot:
 
   #- name: Init k8s
-  #  shell: kubeadm init --pod-network-cidr=10.244.0.0/16 --ignore-preflight-errors=NumCPU
+  #  shell: kubeadm init --pod-network-cidr=10.244.0.0/16
   #- name: Apply flannel (network)
   #  shell: kubectl apply -f https://github.com/flannel-io/flannel/releases/latest/download/kube-flannel.yml
   #- name:
   #  shell: kubectl taint node --all node-role.kubernetes.io/control-plane:NoSchedule-
+  #- name:
+  #  shell: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.8.1/deploy/static/provider/cloud/deploy.yaml
diff --git a/rootfs/etc/cni/net.d/10-crio.conf b/rootfs/etc/cni/net.d/10-crio.conf
deleted file mode 100644
index 8c0c866..0000000
--- a/rootfs/etc/cni/net.d/10-crio.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "crio",
-    "type": "flannel"
-}