feat(lb): honor lb vip mask from api
Release Chart / release (push) Successful in 5s
deploy / build (push) Successful in 2m40s

This commit is contained in:
2026-08-01 21:04:58 +03:30
parent f991c2fe15
commit 8718d27fc7
4 changed files with 108 additions and 26 deletions
+33 -3
View File
@@ -3,6 +3,7 @@ package controller
import (
"context"
"fmt"
"net"
"os"
"strings"
"time"
@@ -14,9 +15,9 @@ import (
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"github.com/KubelanCloud/kks-provider-plugin/pkg/kloudlb"
@@ -177,16 +178,22 @@ func (c *Controller) sync(ctx context.Context, key string) error {
if err != nil {
return err
}
vip := strings.TrimSpace(lb.IP)
ingressIP, err := vipIngressIP(vip)
if err != nil {
return err
}
patch := svc.DeepCopy()
if patch.Annotations == nil {
patch.Annotations = map[string]string{}
}
patch.Annotations[kloudlb.AnnotationIP] = lb.IP
patch.Annotations[kloudlb.AnnotationIP] = ingressIP
patch.Annotations[kloudlb.AnnotationVIP] = vip
patch.Annotations[kloudlb.AnnotationLBID] = lb.ID
patch.Status = corev1.ServiceStatus{
LoadBalancer: corev1.LoadBalancerStatus{
Ingress: []corev1.LoadBalancerIngress{{IP: lb.IP}},
Ingress: []corev1.LoadBalancerIngress{{IP: ingressIP}},
},
}
@@ -194,6 +201,29 @@ func (c *Controller) sync(ctx context.Context, key string) error {
return err
}
func vipIngressIP(vip string) (string, error) {
vip = strings.TrimSpace(vip)
if vip == "" {
return "", fmt.Errorf("load balancer vip is empty")
}
if strings.Contains(vip, "/") {
ip, _, err := net.ParseCIDR(vip)
if err != nil {
return "", fmt.Errorf("invalid load balancer vip %q: %w", vip, err)
}
ipv4 := ip.To4()
if ipv4 == nil {
return "", fmt.Errorf("load balancer vip %q is not ipv4", vip)
}
return ipv4.String(), nil
}
ip := net.ParseIP(vip)
if ip == nil || ip.To4() == nil {
return "", fmt.Errorf("invalid load balancer vip %q", vip)
}
return ip.String(), nil
}
func (c *Controller) finalize(ctx context.Context, svc *corev1.Service) error {
if !containsString(svc.Finalizers, kloudlb.Finalizer) {
return nil