From 6c026a0a985545735aef12020eb68bf9f34eecc7 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Thu, 16 Jan 2025 13:16:23 +0900 Subject: [PATCH] loxilb-io/loxilb#877 egress support - updated manifests --- manifest/in-cluster/loxilb-localvip.yaml | 1 + manifest/in-cluster/loxilb-nobgp.yaml | 1 + manifest/in-cluster/loxilb.yaml | 1 + manifest/multus/loxilb.yaml | 1 + .../service-proxy/loxilb-service-proxy-non-privileged.yml | 1 + manifest/service-proxy/loxilb-service-proxy.yml | 1 + pkg/agent/manager/loadbalancer/loadbalancer.go | 4 ++-- pkg/api/client.go | 2 +- 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/manifest/in-cluster/loxilb-localvip.yaml b/manifest/in-cluster/loxilb-localvip.yaml index a0d4745..49de928 100644 --- 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 index 02a8395..b88f2d1 100644 --- 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 index 0288618..57ef8ad 100644 --- 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 index 5c3346c..4fb82f8 100644 --- 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 index f87ab34..a889881 100644 --- 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 index 1086973..755f1f0 100644 --- 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 index 017111b..8b57e01 100644 --- 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 index ebe2cc0..733ac49 100644 --- 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 {