homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ingress status for ClusterIP and NodePort Service Type

Browse source
This commit is contained in:
mlec 2025-01-03 16:10:04 +01:00 • committed by GitHub
parent 845d0b5ac7
commit 6d3a685d5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 505 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

81
pkg/provider/kubernetes/ingress/kubernetes.go
View file

@ -247,6 +247,10 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
continue
}
if err := p.updateIngressStatus(ingress, client); err != nil {
logger.Error().Err(err).Msg("Error while updating ingress status")
}
rtConfig, err := parseRouterConfig(ingress.Annotations)
if err != nil {
logger.Error().Err(err).Msg("Failed to parse annotations")
@ -305,10 +309,6 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
routers := map[string][]*dynamic.Router{}
for _, rule := range ingress.Spec.Rules {
if err := p.updateIngressStatus(ingress, client); err != nil {
logger.Error().Err(err).Msg("Error while updating ingress status")
}
if rule.HTTP == nil {
continue
}
@ -407,22 +407,75 @@ func (p *Provider) updateIngressStatus(ing *netv1.Ingress, k8sClient Client) err
return fmt.Errorf("cannot get service %s, received error: %w", p.IngressEndpoint.PublishedService, err)
}
if exists && service.Status.LoadBalancer.Ingress == nil {
// service exists, but has no Load Balancer status
log.Debug().Msgf("Skipping updating Ingress %s/%s due to service %s having no status set", ing.Namespace, ing.Name, p.IngressEndpoint.PublishedService)
return nil
}
if !exists {
return fmt.Errorf("missing service: %s", p.IngressEndpoint.PublishedService)
}
ingresses, err := convertSlice[netv1.IngressLoadBalancerIngress](service.Status.LoadBalancer.Ingress)
if err != nil {
return err
var ingressStatus []netv1.IngressLoadBalancerIngress
switch service.Spec.Type {
case corev1.ServiceTypeLoadBalancer:
if service.Status.LoadBalancer.Ingress == nil {
// service exists, but has no Load Balancer status
log.Debug().Msgf("Skipping updating Ingress %s/%s due to service %s having no status set", ing.Namespace, ing.Name, p.IngressEndpoint.PublishedService)
return nil
}
ingressStatus, err = convertSlice[netv1.IngressLoadBalancerIngress](service.Status.LoadBalancer.Ingress)
if err != nil {
return fmt.Errorf("converting ingress loadbalancer status: %w", err)
}
case corev1.ServiceTypeClusterIP:
var ports []netv1.IngressPortStatus
for _, port := range service.Spec.Ports {
ports = append(ports, netv1.IngressPortStatus{
Port: port.Port,
Protocol: port.Protocol,
})
}
for _, ip := range service.Spec.ExternalIPs {
ingressStatus = append(ingressStatus, netv1.IngressLoadBalancerIngress{
IP: ip,
Ports: ports,
})
}
case corev1.ServiceTypeNodePort:
if p.DisableClusterScopeResources {
return errors.New("node port service type is not supported when cluster scope resources lookup is disabled")
}
nodes, _, err := k8sClient.GetNodes()
if err != nil {
return fmt.Errorf("getting nodes: %w", err)
}
var ports []netv1.IngressPortStatus
for _, port := range service.Spec.Ports {
ports = append(ports, netv1.IngressPortStatus{
Port: port.NodePort,
Protocol: port.Protocol,
})
}
for _, node := range nodes {
for _, address := range node.Status.Addresses {
if address.Type == corev1.NodeExternalIP {
ingressStatus = append(ingressStatus, netv1.IngressLoadBalancerIngress{
IP: address.Address,
Ports: ports,
})
}
}
}
default:
return fmt.Errorf("unsupported service type: %s", service.Spec.Type)
}
return k8sClient.UpdateIngressStatus(ing, ingresses)
return k8sClient.UpdateIngressStatus(ing, ingressStatus)
}
func (p *Provider) shouldProcessIngress(ingress *netv1.Ingress, ingressClasses []*netv1.IngressClass) bool {