Merge pull request #805 from TrekkieCoder/main

PR: loxilb-io/kube-loxilb#169 Updated kube-loxilb yaml to conform to multiple CIDR pool support semantics
loxilb-io · Sep 13, 2024 · d3b4e41 · d3b4e41
2 parents 7236ab0 + d882a38
commit d3b4e41
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 17 deletions.
diff --git a/cicd/k8s-calico-ipvs/yaml/kube-loxilb.yml b/cicd/k8s-calico-ipvs/yaml/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.9: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/k8s-calico-ipvs/yaml/sctp_fullnat.yml b/cicd/k8s-calico-ipvs/yaml/sctp_fullnat.yml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: sctp-lb-fullnat
   annotations:
-   loxilb.io/num-secondary-networks: "2"
+   loxilb.io/poolSelectSecondary: "pool2,pool3"
    loxilb.io/liveness: "yes"
    loxilb.io/lbmode: "fullnat"
 spec:

diff --git a/cicd/k8s-calico-ipvs2-ha-ka-sync/yaml/kube-loxilb.yml b/cicd/k8s-calico-ipvs2-ha-ka-sync/yaml/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.252:11111,http://192.168.80.253: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
         #- --monitor
         #- --setBGP=64511
         #- --extBGPPeers=50.50.50.1:65101,51.51.51.1:65102

diff --git a/cicd/k8s-calico-ipvs2/yaml/kube-loxilb.yml b/cicd/k8s-calico-ipvs2/yaml/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.252:11111,http://192.168.80.253: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
         #- --monitor
         #- --setBGP=64511
         #- --extBGPPeers=50.50.50.1:65101,51.51.51.1:65102

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

diff --git a/cicd/k8s-calico-ipvs3-ha/yaml/kube-loxilb.yml b/cicd/k8s-calico-ipvs3-ha/yaml/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.252:11111,http://192.168.80.253: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=192.168.90.9:64512

diff --git a/cicd/k8s-calico-ipvs3/yaml/kube-loxilb.yml b/cicd/k8s-calico-ipvs3/yaml/kube-loxilb.yml
@@ -111,8 +111,7 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.80.252:11111,http://192.168.80.253: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=192.168.80.9:64512

diff --git a/cicd/k8s-calico-ubuntu22/yaml/kube-loxilb.yml b/cicd/k8s-calico-ubuntu22/yaml/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/k8s-calico/yaml/kube-loxilb.yml b/cicd/k8s-calico/yaml/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/k8s-nat64/kube-loxilb.yaml b/cicd/k8s-nat64/kube-loxilb.yaml
@@ -111,8 +111,8 @@ spec:
         - /bin/kube-loxilb
         args:
         - --loxiURL=http://192.168.59.101:11111,http://192.168.59.111:11111
-          #- --externalCIDR=123.123.123.1/24
-        - --externalCIDR=3ffe::1/96
+          #- --cidrPools=defaultPool=123.123.123.1/24
+        - --cidrPools=defaultPool=3ffe::1/96
         - --setBGP=64511
         - --setLBMode=2
         #- --config=/opt/loxilb/agent/kube-loxilb.conf

diff --git a/cicd/microk8s-incluster/kube-loxilb.yml b/cicd/microk8s-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