Merge pull request #229 from loxilb-io/zoning-names

PR - loxilb-io/loxilb#877 egress support - updated manifests
loxilb-io · Jan 16, 2025 · a9c2050 · a9c2050
2 parents b8012d3 + e7968ee
commit a9c2050
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 3 deletions.
diff --git a/manifest/in-cluster/loxilb-localvip.yaml b/manifest/in-cluster/loxilb-localvip.yaml
@@ -94,6 +94,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   type: LoadBalancer
   loadBalancerClass: loxilb.io/loxilb

diff --git a/manifest/in-cluster/loxilb-nobgp.yaml b/manifest/in-cluster/loxilb-nobgp.yaml
@@ -50,6 +50,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   type: LoadBalancer
   loadBalancerClass: loxilb.io/loxilb

diff --git a/manifest/in-cluster/loxilb.yaml b/manifest/in-cluster/loxilb.yaml
@@ -52,6 +52,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   type: LoadBalancer
   loadBalancerClass: loxilb.io/loxilb

diff --git a/manifest/multus/loxilb.yaml b/manifest/multus/loxilb.yaml
@@ -54,6 +54,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   type: LoadBalancer
   loadBalancerClass: loxilb.io/loxilb

diff --git a/manifest/service-proxy/loxilb-service-proxy-non-privileged.yml b/manifest/service-proxy/loxilb-service-proxy-non-privileged.yml
@@ -77,6 +77,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   externalTrafficPolicy: Local
   type: LoadBalancer

diff --git a/manifest/service-proxy/loxilb-service-proxy.yml b/manifest/service-proxy/loxilb-service-proxy.yml
@@ -137,6 +137,7 @@ metadata:
   annotations:
     loxilb.io/egress: "yes"
     loxilb.io/probetype: "none"
+    loxilb.io/staticIP: "0.0.0.0"
 spec:
   type: LoadBalancer
   loadBalancerClass: loxilb.io/loxilb

diff --git a/pkg/agent/manager/loadbalancer/loadbalancer.go b/pkg/agent/manager/loadbalancer/loadbalancer.go
@@ -2373,8 +2373,8 @@ loop:
 
 				for instName, vi := range aliveClient.InstRoles {
 					firstZoneName := api.GenZoneInstName(m.networkConfig.Zone, 0)
-					if instName == firstZoneName && m.networkConfig.Zone != api.CIDefault {
-						defaultZoneName := api.GenZoneInstName(api.CIDefault, 0)
+					if instName == firstZoneName && m.networkConfig.Zone != api.CIDefaultZone {
+						defaultZoneName := api.GenZoneInstName(api.CIDefaultZone, 0)
 						cisModel, err := m.makeLoxiLBCIStatusModel(instName, m.networkConfig.SetRoles, aliveClient)
 						cisModel.Instance = defaultZoneName
 						if err == nil {

diff --git a/pkg/api/client.go b/pkg/api/client.go
@@ -35,7 +35,7 @@ func NewLoxiClientPool() *LoxiClientPool {
 }
 
 const (
-	CIDefault = "llb-inst0"
+	CIDefaultZone = "llb"
 )
 
 type LoxiClient struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ func NewLoxiClientPool() *LoxiClientPool { @@
     }
     const (
-    	CIDefault = "llb-inst0"
+    	CIDefaultZone = "llb"
     )
     type LoxiClient struct {
@@ Expand Down @@