Merge pull request #365 from TrekkieCoder/main

PR : incluster mode changes
loxilb-io · Jul 28, 2023 · 5711621 · 5711621
2 parents 5ac6e64 + f884a86
commit 5711621
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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