From 7b4429a554bad4aeb2b4f9894c500f798a5fec52 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 13 Sep 2024 00:26:58 +0900 Subject: [PATCH] loxilb-io/kube-loxilb#169 Updated kube-loxilb yaml to conform to multi CIDR pool support semantics --- cicd/docker-k0s-lb/kube-loxilb.yml | 2 +- cicd/docker-k3s-calico/kube-loxilb.yml | 2 +- cicd/docker-k3s-cilium/kube-loxilb.yml | 2 +- cicd/eks/kube-loxilb.yaml | 3 +-- cicd/k0s-incluster/kube-loxilb.yml | 2 +- cicd/k0s-weave/kube-loxilb.yml | 3 +-- cicd/k3s-base-sanity/kube-loxilb.yml | 2 +- cicd/k3s-calico-dual-stack/kube-loxilb.yml | 4 ++-- cicd/k3s-calico-incluster/kube-loxilb.yml | 3 +-- cicd/k3s-calico-single-node-incluster/kube-loxilb.yml | 3 +-- cicd/k3s-calico/kube-loxilb.yml | 2 +- cicd/k3s-cilium-cluster/kube-loxilb.yml | 2 +- cicd/k3s-cilium/kube-loxilb.yml | 2 +- cicd/k3s-ext-ep/kube-loxilb.yml | 3 +-- cicd/k3s-flannel-cluster-ipvs-compat/kube-loxilb.yml | 2 +- cicd/k3s-flannel-cluster/kube-loxilb.yml | 2 +- cicd/k3s-flannel-incluster-l2/kube-loxilb.yml | 2 +- cicd/k3s-flannel-incluster/kube-loxilb.yml | 2 +- cicd/k3s-flannel-loxilb-ingress/kube-loxilb.yml | 2 +- cicd/k3s-flannel-multus/kube-loxilb.yml | 3 +-- cicd/k3s-flannel-multus/multus/multus-sctp-service.yml | 2 +- cicd/k3s-flannel/kube-loxilb.yml | 2 +- cicd/k3s-incluster/kube-loxilb.yml | 2 +- cicd/k3s-multi-master-service-proxy-calico/kube-loxilb.yml | 2 +- cicd/k3s-multi-master-service-proxy/kube-loxilb.yml | 2 +- cicd/k3s-rabbitmq-incluster/kube-loxilb.yml | 2 +- cicd/k3s-rabbitmq-incluster/manifests/kube-loxilb.yml | 2 +- cicd/k3s-sctpmh-2/kube-loxilb.yml | 3 +-- cicd/k3s-sctpmh-2/sctp-svc-lb.yml | 2 +- cicd/k3s-sctpmh-seagull/kube-loxilb.yml | 3 +-- cicd/k3s-sctpmh-seagull/multus/multus-sctp-service.yml | 2 +- cicd/k3s-sctpmh-seagull/multus/multus-seagull-service.yml | 2 +- cicd/k3s-sctpmh/kube-loxilb.yml | 3 +-- cicd/k3s-sctpmh/sctp-svc-lb.yml | 2 +- cicd/k8s-calico-incluster/yaml/kube-loxilb.yaml | 3 +-- cicd/k8s-calico-incluster/yaml/sctp_fullnat.yml | 1 - 36 files changed, 36 insertions(+), 47 deletions(-) diff --git a/cicd/docker-k0s-lb/kube-loxilb.yml b/cicd/docker-k0s-lb/kube-loxilb.yml index 2d068185..ae9d4e67 100644 --- 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 index 05ea21ab..e49c3aec 100644 --- 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 index 05ea21ab..e49c3aec 100644 --- 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 index f2d54475..3c60aed6 100644 --- 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 index 6a7e7aa4..ef86b0f1 100644 --- 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 index cdc5c746..4a0b9744 100644 --- 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 index 18c4da50..83b695f7 100644 --- 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 index 27f522a8..b9fe885c 100644 --- 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 index 9c909059..ed875f3b 100644 --- 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 index fa66e217..bec0145d 100644 --- 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 index a9284b24..4a0b9744 100644 --- 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 index 5246d4bf..8dd66ed3 100644 --- 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 index a9284b24..4a0b9744 100644 --- 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 index 0a62bfc1..85670b3a 100644 --- 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 index 9357b17b..2e36bf34 100644 --- 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 index 5246d4bf..8dd66ed3 100644 --- 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 index 0f1ed7a5..415d2c8a 100644 --- 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 index 910c5e19..b18da9f0 100644 --- 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 index 93a52b37..1b2f760f 100644 --- 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 index 48f1da65..b1bf1496 100644 --- 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 index 93f14ca9..49a2b42f 100644 --- 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 index 18c4da50..83b695f7 100644 --- 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 index 6a7e7aa4..ef86b0f1 100644 --- 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 index f4800829..f57f3c44 100644 --- 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 index f4800829..f57f3c44 100644 --- 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 index f6d54ad8..414e820b 100644 --- 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 index 9357b17b..2e36bf34 100644 --- 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 index cd36ced1..f727d1a2 100644 --- 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 index 32b749bc..2abe38bc 100644 --- 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 index 5595ba85..f06f18e0 100644 --- 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 index 93f14ca9..49a2b42f 100644 --- 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 index d43d6a5e..54364ff4 100644 --- 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 index 202ee22c..2d407e76 100644 --- 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 index 692069ab..3f3e5e88 100644 --- 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 index fe029313..b70b66ff 100644 --- 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 index 5ac9a69b..199d2a40 100644 --- 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: