From 3ac77a7fe489f91484c0ea4e4a5f5edd53d9b332 Mon Sep 17 00:00:00 2001
From: Trekkie Coder <trekkie@netlox.io>
Date: Tue, 9 Jan 2024 17:44:19 +0900
Subject: [PATCH] cicd updates for kube-proxy replacement

---
 cicd/k3s-flannel-cluster-ipvs-compat/loxilb.yml | 2 +-
 cicd/k3s-flannel-cluster-ipvs-compat/master.sh  | 2 +-
 cicd/k3s-flannel-cluster-ipvs-compat/worker.sh  | 2 +-
 loxilb-ebpf                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cicd/k3s-flannel-cluster-ipvs-compat/loxilb.yml b/cicd/k3s-flannel-cluster-ipvs-compat/loxilb.yml
index 765cfd037..50cd07ceb 100644
--- a/cicd/k3s-flannel-cluster-ipvs-compat/loxilb.yml
+++ b/cicd/k3s-flannel-cluster-ipvs-compat/loxilb.yml
@@ -101,7 +101,7 @@ spec:
       serviceAccountName: loxilb-lb
       containers:
       - name: loxilb-lb
-        image: "ghcr.io/loxilb-io/loxilb:debug"
+        image: "ghcr.io/loxilb-io/loxilb:latest"
         imagePullPolicy: Always
         #command: [ "sleep", "72000" ]
         command: [ "/root/loxilb-io/loxilb/loxilb", "--egr-hooks", "--blacklist=cni.|veth.|flannel.|cali.|tunl.|vxlan[.]calico", "--ipvs-compat", "--k8s-api=cluster" ]
diff --git a/cicd/k3s-flannel-cluster-ipvs-compat/master.sh b/cicd/k3s-flannel-cluster-ipvs-compat/master.sh
index b2d757a51..edd489c57 100644
--- a/cicd/k3s-flannel-cluster-ipvs-compat/master.sh
+++ b/cicd/k3s-flannel-cluster-ipvs-compat/master.sh
@@ -1,6 +1,6 @@
 export MASTER_IP=$(ip a |grep global | grep -v '10.0.2.15' | grep '192.168.80' | awk '{print $2}' | cut -f1 -d '/')
 
-curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--disable traefik --disable servicelb --disable-cloud-controller --kube-proxy-arg proxy-mode=ipvs \
+curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--disable traefik --disable servicelb --disable-cloud-controller --kube-proxy-arg proxy-mode=ipvs --flannel-iface=eth1 \
 --node-ip=${MASTER_IP} --node-external-ip=${MASTER_IP} \
 --bind-address=${MASTER_IP}" sh -
 
diff --git a/cicd/k3s-flannel-cluster-ipvs-compat/worker.sh b/cicd/k3s-flannel-cluster-ipvs-compat/worker.sh
index 75c49ddcd..cda6b36a8 100644
--- a/cicd/k3s-flannel-cluster-ipvs-compat/worker.sh
+++ b/cicd/k3s-flannel-cluster-ipvs-compat/worker.sh
@@ -4,7 +4,7 @@ export NODE_TOKEN=$(cat /vagrant/node-token)
 
 sudo mkdir -p /etc/rancher/k3s
 sudo cp -f /vagrant/k3s.yaml /etc/rancher/k3s/k3s.yaml
-curl -sfL https://get.k3s.io | K3S_URL="https://${MASTER_ADDR}:6443" K3S_TOKEN="${NODE_TOKEN}" INSTALL_K3S_EXEC="--node-ip=${WORKER_ADDR} --node-external-ip=${WORKER_ADDR} --kube-proxy-arg proxy-mode=ipvs" sh -
+curl -sfL https://get.k3s.io | K3S_URL="https://${MASTER_ADDR}:6443" K3S_TOKEN="${NODE_TOKEN}" INSTALL_K3S_EXEC="--node-ip=${WORKER_ADDR} --node-external-ip=${WORKER_ADDR} --kube-proxy-arg proxy-mode=ipvs --flannel-iface=eth1" sh -
 #sudo kubectl apply -f /vagrant/nginx.yml
 #sudo kubectl apply -f /vagrant/udp.yml
 sudo kubectl apply -f /vagrant/iperf-service.yml
diff --git a/loxilb-ebpf b/loxilb-ebpf
index 582be1541..8f42f04ab 160000
--- a/loxilb-ebpf
+++ b/loxilb-ebpf
@@ -1 +1 @@
-Subproject commit 582be1541635d83cb4d71e8a1da858b519da43f2
+Subproject commit 8f42f04ab9e038dd64443f7e22f1b23c2a4154a8