From 93318940c623f5c7f6311eb83474e5d66b438374 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Thu, 27 Jul 2023 23:41:29 +0900 Subject: [PATCH 1/4] cicd for in-cluster mode updated --- cicd/k3s-flannel-incluster/kube-loxilb.yml | 2 +- cicd/k3s-flannel-incluster/loxilb.yml | 2 +- cicd/k3s-flannel-incluster/nginx.yml | 2 +- cicd/k3s-flannel-incluster/sctp.yml | 2 +- cicd/k3s-flannel-incluster/udp.yml | 2 +- loxilb-ebpf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cicd/k3s-flannel-incluster/kube-loxilb.yml b/cicd/k3s-flannel-incluster/kube-loxilb.yml index a0d5da416..71b84997d 100644 --- a/cicd/k3s-flannel-incluster/kube-loxilb.yml +++ b/cicd/k3s-flannel-incluster/kube-loxilb.yml @@ -106,7 +106,7 @@ spec: terminationGracePeriodSeconds: 0 containers: - name: kube-loxilb - image: ghcr.io/loxilb-io/kube-loxilb:debug + image: ghcr.io/loxilb-io/kube-loxilb:latest imagePullPolicy: Always command: - /bin/kube-loxilb diff --git a/cicd/k3s-flannel-incluster/loxilb.yml b/cicd/k3s-flannel-incluster/loxilb.yml index 08ff355e0..0ff046375 100644 --- a/cicd/k3s-flannel-incluster/loxilb.yml +++ b/cicd/k3s-flannel-incluster/loxilb.yml @@ -32,7 +32,7 @@ spec: containers: - name: loxilb-app image: "ghcr.io/loxilb-io/loxilb:latest" - command: [ "/root/loxilb-io/loxilb/loxilb", "--bgp" ] + command: [ "/root/loxilb-io/loxilb/loxilb", "--bgp", "--egr-hooks" ] ports: - containerPort: 11111 - containerPort: 179 diff --git a/cicd/k3s-flannel-incluster/nginx.yml b/cicd/k3s-flannel-incluster/nginx.yml index e6d7ccec4..c188a6cff 100644 --- a/cicd/k3s-flannel-incluster/nginx.yml +++ b/cicd/k3s-flannel-incluster/nginx.yml @@ -3,7 +3,7 @@ kind: Service metadata: name: nginx-lb1 annotations: - loxilb.io/lbmode: "onearm" + loxilb.io/lbmode: "fullnat" spec: externalTrafficPolicy: Local loadBalancerClass: loxilb.io/loxilb diff --git a/cicd/k3s-flannel-incluster/sctp.yml b/cicd/k3s-flannel-incluster/sctp.yml index 292c2584e..befccd4d4 100644 --- a/cicd/k3s-flannel-incluster/sctp.yml +++ b/cicd/k3s-flannel-incluster/sctp.yml @@ -4,7 +4,7 @@ metadata: name: sctp-lb1 annotations: loxilb.io/liveness: "yes" - loxilb.io/lbmode: "onearm" + loxilb.io/lbmode: "fullnat" spec: loadBalancerClass: loxilb.io/loxilb externalTrafficPolicy: Local diff --git a/cicd/k3s-flannel-incluster/udp.yml b/cicd/k3s-flannel-incluster/udp.yml index d56720dee..1d7f647ec 100644 --- a/cicd/k3s-flannel-incluster/udp.yml +++ b/cicd/k3s-flannel-incluster/udp.yml @@ -4,7 +4,7 @@ metadata: name: udp-lb1 annotations: loxilb.io/liveness: "yes" - loxilb.io/lbmode: "onearm" + loxilb.io/lbmode: "fullnat" spec: loadBalancerClass: loxilb.io/loxilb externalTrafficPolicy: Local diff --git a/loxilb-ebpf b/loxilb-ebpf index 82fff7db3..de9d68ee0 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 82fff7db34b1b61ee90509a7d97142961eb49706 +Subproject commit de9d68ee0a3b1a2212aed8b82a70fdcfdc9d4cc4 From 0d0327ab2232b95a5847da9f310404a486498b20 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 28 Jul 2023 01:13:06 +0900 Subject: [PATCH 2/4] cicd for in-cluster mode updated --- cicd/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cicd/common.sh b/cicd/common.sh index 5e8861b8b..5f333cd9e 100644 --- a/cicd/common.sh +++ b/cicd/common.sh @@ -116,7 +116,7 @@ spawn_docker_host() { fi fi docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dt --entrypoint /bin/bash $bgp_conf -v /dev/log:/dev/log -v /etc/shared/$dname:/etc/shared $loxilb_config $ka_conf --name $dname $lxdocker - docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts $cluster_opts $ka_opts + docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts $cluster_opts $ka_opts --egr-hooks if [[ "$ka" == "out" ]];then ka_opts="-k out" @@ -128,7 +128,7 @@ spawn_docker_host() { fi else docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dt --entrypoint /bin/bash $bgp_conf -v /dev/log:/dev/log $loxilb_config --name $dname $lxdocker $bgp_opts - docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts + docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts --egr-hooks fi elif [[ "$dtype" == "host" ]]; then if [[ ! -z "$bpath" ]]; then From 1bdbc9f805852544ddec3b8b78cdac62411511c6 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 28 Jul 2023 14:44:16 +0900 Subject: [PATCH 3/4] Changes for egr hooks --- Makefile | 2 ++ cicd/common.sh | 4 ++-- loxilb-ebpf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f9e6b9d19..f6677cf30 100644 --- a/Makefile +++ b/Makefile @@ -28,11 +28,13 @@ run: docker-cp: build docker cp loxilb $(loxilbid):/root/loxilb-io/loxilb/loxilb docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.o + docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o docker cp loxilb-ebpf/kernel/loxilb_dp_debug $(loxilbid):/usr/local/sbin/ docker-cp-ebpf: build docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.o + docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o docker-run: diff --git a/cicd/common.sh b/cicd/common.sh index 5f333cd9e..5e8861b8b 100644 --- a/cicd/common.sh +++ b/cicd/common.sh @@ -116,7 +116,7 @@ spawn_docker_host() { fi fi docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dt --entrypoint /bin/bash $bgp_conf -v /dev/log:/dev/log -v /etc/shared/$dname:/etc/shared $loxilb_config $ka_conf --name $dname $lxdocker - docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts $cluster_opts $ka_opts --egr-hooks + docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts $cluster_opts $ka_opts if [[ "$ka" == "out" ]];then ka_opts="-k out" @@ -128,7 +128,7 @@ spawn_docker_host() { fi else docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dt --entrypoint /bin/bash $bgp_conf -v /dev/log:/dev/log $loxilb_config --name $dname $lxdocker $bgp_opts - docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts --egr-hooks + docker exec -dt $dname /root/loxilb-io/loxilb/loxilb $bgp_opts fi elif [[ "$dtype" == "host" ]]; then if [[ ! -z "$bpath" ]]; then diff --git a/loxilb-ebpf b/loxilb-ebpf index de9d68ee0..cb43f74ae 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit de9d68ee0a3b1a2212aed8b82a70fdcfdc9d4cc4 +Subproject commit cb43f74ae28f83227d6deec6aac60350e1a14afe From f884a86b7664750b6e8b31b086a7d7e9aa2bd67d Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 28 Jul 2023 19:33:26 +0900 Subject: [PATCH 4/4] egr hooks: updated to latest submodule --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index cb43f74ae..718804d25 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit cb43f74ae28f83227d6deec6aac60350e1a14afe +Subproject commit 718804d2510df6853e1be9b350652f14b915a7fe