Merge pull request #804 from TrekkieCoder/main

PR: loxilb-io/kube-loxilb#169 Updated kube-loxilb yaml to conform to mult…
loxilb-io · Sep 12, 2024 · 7236ab0 · 7236ab0
2 parents 5a7f2f0 + 7b4429a
commit 7236ab0
Show file tree

Hide file tree

Showing 36 changed files with 36 additions and 47 deletions.
diff --git a/cicd/docker-k0s-lb/kube-loxilb.yml b/cicd/docker-k0s-lb/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=192.168.82.100/32
+        - --cidrPools=defaultPool=192.168.82.100/32
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/docker-k3s-calico/kube-loxilb.yml b/cicd/docker-k3s-calico/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=192.168.163.247/32
+        - --cidrPools=defaultPool=192.168.163.247/32
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/docker-k3s-cilium/kube-loxilb.yml b/cicd/docker-k3s-cilium/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=192.168.163.247/32
+        - --cidrPools=defaultPool=192.168.163.247/32
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/eks/kube-loxilb.yaml b/cicd/eks/kube-loxilb.yaml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://$LOXILB_PRIVATE_IP:11111
-        - --externalCIDR=$LOXILB_PRIVATE_IP/32
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=$LOXILB_PRIVATE_IP/32
         #- --monitor
         #- --setBGP
         - --setLBMode=2

diff --git a/cicd/k0s-incluster/kube-loxilb.yml b/cicd/k0s-incluster/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=192.168.82.100/32
+        - --cidrPools=defaultPool=192.168.82.100/32
         - --setRoles=0.0.0.0
         #- --monitor
         #- --setBGP

diff --git a/cicd/k0s-weave/kube-loxilb.yml b/cicd/k0s-weave/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
-        - --externalCIDR=123.123.123.1/24
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-base-sanity/kube-loxilb.yml b/cicd/k3s-base-sanity/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://12.12.12.2:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         - --setBGP=64512
         - --extBGPPeers=10.10.10.254:64512,12.12.12.254:64514,11.11.11.254:64511

diff --git a/cicd/k3s-calico-dual-stack/kube-loxilb.yml b/cicd/k3s-calico-dual-stack/kube-loxilb.yml
@@ -111,8 +111,8 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111
-        - --externalCIDR=123.123.123.1/24
-        - --externalCIDR6=2001::1/128
+        - --cidrPools=defaultPool=123.123.123.1/24
+        - --cidr6Pools=defaultPool==2001::1/128
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-calico-incluster/kube-loxilb.yml b/cicd/k3s-calico-incluster/kube-loxilb.yml
@@ -112,8 +112,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=123.123.123.1/24
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         - --setBGP=64512
         - --listenBGPPort=1791
         - --setRoles=0.0.0.0

diff --git a/cicd/k3s-calico-single-node-incluster/kube-loxilb.yml b/cicd/k3s-calico-single-node-incluster/kube-loxilb.yml
@@ -112,8 +112,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.82.128:11111
-        - --externalCIDR=192.168.80.5/32
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=192.168.80.5/32
         #- --setBGP=64512
         #- --listenBGPPort=1791
         - --setRoles=0.0.0.0

diff --git a/cicd/k3s-calico/kube-loxilb.yml b/cicd/k3s-calico/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-cilium-cluster/kube-loxilb.yml b/cicd/k3s-cilium-cluster/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-cilium/kube-loxilb.yml b/cicd/k3s-cilium/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-ext-ep/kube-loxilb.yml b/cicd/k3s-ext-ep/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=20.20.20.1/32
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=20.20.20.1/32
         #- --monitor
         #- --setBGP=64511
         #- --extBGPPeers=50.50.50.1:65101,51.51.51.1:65102

diff --git a/cicd/k3s-flannel-cluster-ipvs-compat/kube-loxilb.yml b/cicd/k3s-flannel-cluster-ipvs-compat/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=192.168.80.20/32
+        - --cidrPools=defaultPool=192.168.80.20/32
         - --setRoles=0.0.0.0
         #- --monitor
         #- --setBGP

diff --git a/cicd/k3s-flannel-cluster/kube-loxilb.yml b/cicd/k3s-flannel-cluster/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-flannel-incluster-l2/kube-loxilb.yml b/cicd/k3s-flannel-incluster-l2/kube-loxilb.yml
@@ -125,7 +125,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=192.168.80.200/32
+        - --cidrPools=defaultPool=192.168.80.200/32
         #- --setBGP=64512
         - --setRoles=0.0.0.0
         #- --monitor

diff --git a/cicd/k3s-flannel-incluster/kube-loxilb.yml b/cicd/k3s-flannel-incluster/kube-loxilb.yml
@@ -112,7 +112,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         - --setBGP=64512
         - --setRoles=0.0.0.0
         - --extBGPPeers=192.168.90.9:64511

diff --git a/cicd/k3s-flannel-loxilb-ingress/kube-loxilb.yml b/cicd/k3s-flannel-loxilb-ingress/kube-loxilb.yml
@@ -112,7 +112,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=192.168.80.9/32
+        - --cidrPools=defaultPool=192.168.80.9/32
         #- --zone=aws
         #- --setBGP=64512
         #- --setRoles=0.0.0.0

diff --git a/cicd/k3s-flannel-multus/kube-loxilb.yml b/cicd/k3s-flannel-multus/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://4.0.6.149:11111
-        - --externalCIDR=4.0.5.2/32
-        - --externalSecondaryCIDRs=4.0.4.1/24,4.0.3.1/24
+        - --cidrPools=defaultPool=4.0.5.2/32,pool2=4.0.4.1/24,pool3=4.0.3.1/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-flannel-multus/multus/multus-sctp-service.yml b/cicd/k3s-flannel-multus/multus/multus-sctp-service.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: multus-sctp-service
   annotations:
-    loxilb.io/num-secondary-networks: "2"
+    loxilb.io/poolSelectSecondary: "pool2,pool3"
     loxilb.io/multus-nets: macvlan1,macvlan2
     loxilb.io/lbmode: "fullnat"
 spec:

diff --git a/cicd/k3s-flannel/kube-loxilb.yml b/cicd/k3s-flannel/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://12.12.12.2:11111
-        - --externalCIDR=123.123.123.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24
         #- --monitor
         - --setBGP=64512
         - --extBGPPeers=10.10.10.254:64512,12.12.12.254:64514,11.11.11.254:64511

diff --git a/cicd/k3s-incluster/kube-loxilb.yml b/cicd/k3s-incluster/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://172.17.0.2:11111
-        - --externalCIDR=192.168.82.100/32
+        - --cidrPools=defaultPool=192.168.82.100/32
         - --setRoles=0.0.0.0
         #- --monitor
         #- --setBGP

diff --git a/cicd/k3s-multi-master-service-proxy-calico/kube-loxilb.yml b/cicd/k3s-multi-master-service-proxy-calico/kube-loxilb.yml
@@ -125,7 +125,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=192.168.80.200/32
+        - --cidrPools=defaultPool=192.168.80.200/32
         #- --setBGP=64512
         - --setRoles=0.0.0.0
         - --excludeRoleList=192.168.80.101,192.168.80.102

diff --git a/cicd/k3s-multi-master-service-proxy/kube-loxilb.yml b/cicd/k3s-multi-master-service-proxy/kube-loxilb.yml
@@ -125,7 +125,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=192.168.80.200/32
+        - --cidrPools=defaultPool=192.168.80.200/32
         #- --setBGP=64512
         - --setRoles=0.0.0.0
         - --excludeRoleList=192.168.80.101,192.168.80.102

diff --git a/cicd/k3s-rabbitmq-incluster/kube-loxilb.yml b/cicd/k3s-rabbitmq-incluster/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=192.168.80.20/32
+        - --cidrPools=defaultPool=192.168.80.20/32
         - --setRoles=0.0.0.0
         #- --monitor
         #- --setBGP

diff --git a/cicd/k3s-rabbitmq-incluster/manifests/kube-loxilb.yml b/cicd/k3s-rabbitmq-incluster/manifests/kube-loxilb.yml
@@ -111,7 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.9:11111
-        - --externalCIDR=192.168.80.20/32
+        - --cidrPools=defaultPool=192.168.80.20/32
         - --setRoles=0.0.0.0
         #- --monitor
         #- --setBGP

diff --git a/cicd/k3s-sctpmh-2/kube-loxilb.yml b/cicd/k3s-sctpmh-2/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
-        - --externalCIDR=123.123.123.1/24
-        - --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24,pool2=124.124.124.1/24,pool3=125.125.125.1/24
         #- --monitor
         - --setBGP=64511
         #- --extBGPPeers=50.50.50.1:65101,51.51.51.1:65102

diff --git a/cicd/k3s-sctpmh-2/sctp-svc-lb.yml b/cicd/k3s-sctpmh-2/sctp-svc-lb.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: sctp-lb1
   annotations:
-    loxilb.io/num-secondary-networks: "2"
+    loxilb.io/poolSelectSecondary: "pool2,pool3"
     loxilb.io/lbmode: "fullnat"
     loxilb.io/liveness: "yes"
 spec:

diff --git a/cicd/k3s-sctpmh-seagull/kube-loxilb.yml b/cicd/k3s-sctpmh-seagull/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://4.0.6.10:11111,http://4.0.6.11:11111
-        - --externalCIDR=4.0.5.100/32
-        - --externalSecondaryCIDRs=4.0.4.100/24
+        - --cidrPools=defaultPool=4.0.5.100/32,pool2=4.0.4.100/24
         #- --monitor
         #- --setBGP
         #- --setLBMode=1

diff --git a/cicd/k3s-sctpmh-seagull/multus/multus-sctp-service.yml b/cicd/k3s-sctpmh-seagull/multus/multus-sctp-service.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: multus-sctp-service
   annotations:
-    loxilb.io/num-secondary-networks: "2"
+    loxilb.io/poolSelectSecondary: "pool2,pool3"
     loxilb.io/multus-nets: macvlan1,macvlan2
     loxilb.io/lbmode: "fullnat"
 spec:

diff --git a/cicd/k3s-sctpmh-seagull/multus/multus-seagull-service.yml b/cicd/k3s-sctpmh-seagull/multus/multus-seagull-service.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: multus-seagull-service
   annotations:
-    loxilb.io/num-secondary-networks: "1"
+    loxilb.io/poolSelectSecondary: "pool2"
     loxilb.io/multus-nets: macvlan1,macvlan2
     loxilb.io/lbmode: "fullnat"
     loxilb.io/probetype: "ping"

diff --git a/cicd/k3s-sctpmh/kube-loxilb.yml b/cicd/k3s-sctpmh/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://12.12.12.1:11111,http://14.14.14.1:11111
-        - --externalCIDR=123.123.123.1/24
-        - --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=123.123.123.1/24,pool2=124.124.124.1/24,pool3=125.125.125.1/24
         #- --monitor
         - --setBGP=64511
         #- --extBGPPeers=50.50.50.1:65101,51.51.51.1:65102

diff --git a/cicd/k3s-sctpmh/sctp-svc-lb.yml b/cicd/k3s-sctpmh/sctp-svc-lb.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: sctp-lb1
   annotations:
-    loxilb.io/num-secondary-networks: "2"
+    loxilb.io/poolSelectSecondary: "pool2,pool3"
     loxilb.io/lbmode: "fullnat"
     loxilb.io/liveness: "yes"
 spec:

diff --git a/cicd/k8s-calico-incluster/yaml/kube-loxilb.yaml b/cicd/k8s-calico-incluster/yaml/kube-loxilb.yaml
@@ -163,8 +163,7 @@ spec:
         - /bin/kube-loxilb
         args:
         #- --loxiURL=http://192.168.80.10:11111
-        - --externalCIDR=192.168.80.5/32
-        #- --externalSecondaryCIDRs=124.124.124.1/24,125.125.125.1/24
+        - --cidrPools=defaultPool=192.168.80.5/32
         #- --setBGP=64512
         #- --listenBGPPort=1791
         - --setRoles=0.0.0.0

diff --git a/cicd/k8s-calico-incluster/yaml/sctp_fullnat.yml b/cicd/k8s-calico-incluster/yaml/sctp_fullnat.yml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   name: sctp-lb-fullnat
   annotations:
-    #loxilb.io/num-secondary-networks: "2"
    loxilb.io/liveness: "yes"
    loxilb.io/lbmode: "fullnat"
 spec: