DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix synv endpoints

Browse source 
Signed-off-by: zvlb <vl.zemtsov@gmail.com>
This commit is contained in:
zvlb 2024-02-29 17:52:05 +02:00
parent 654a2bb71a
commit 2e9d625214
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/ingress/controller/controller.go
View file

@ -254,7 +254,7 @@ func (n *NGINXController) syncIngress(interface{}) error {
rc := utilingress.GetRemovedCertificateSerialNumbers(n.runningConfig, pcfg)
n.metricCollector.RemoveMetrics(ri, re, rc)
n.runningConfig.UpdateWithoutEndpoints(pcfg)
n.runningConfig = pcfg
return nil
}
@ -267,11 +267,12 @@ func (n *NGINXController) syncEndpoints(interface{}) error {
return nil
}
TCPEndpoints := n.getStreamServices(n.cfg.TCPConfigMapName, apiv1.ProtocolTCP)
UDPEndpoints := n.getStreamServices(n.cfg.UDPConfigMapName, apiv1.ProtocolUDP)
ings := n.store.ListIngresses()
if ingress.CompareL4Service(n.runningConfig.TCPEndpoints, TCPEndpoints) && ingress.CompareL4Service(n.runningConfig.UDPEndpoints, UDPEndpoints) {
klog.V(3).Infof("No Endpoints change detected, skipping Endpoints reload")
_, _, pcfg := n.getConfiguration(ings)
if n.runningConfig.Equal(pcfg) {
klog.V(3).Infof("No configuration change detected, skipping backend reload")
return nil
}
@ -284,7 +285,7 @@ func (n *NGINXController) syncEndpoints(interface{}) error {
retriesRemaining := retry.Steps
err := wait.ExponentialBackoff(retry, func() (bool, error) {
err := updateStreamConfiguration(TCPEndpoints, UDPEndpoints)
err := n.configureDynamically(pcfg)
if err == nil {
klog.V(2).Infof("Endpoints reconfiguration succeeded.")
return true, nil
@ -302,7 +303,7 @@ func (n *NGINXController) syncEndpoints(interface{}) error {
return err
}
n.runningConfig.UpdateEndpoints(TCPEndpoints, UDPEndpoints)
n.runningConfig = pcfg
return nil
}

14
internal/ingress/controller/nginx.go
View file

@ -828,13 +828,13 @@ func (n *NGINXController) configureDynamically(pcfg *ingress.Configuration) erro
}
}
// streamConfigurationChanged := !reflect.DeepEqual(n.runningConfig.TCPEndpoints, pcfg.TCPEndpoints) || !reflect.DeepEqual(n.runningConfig.UDPEndpoints, pcfg.UDPEndpoints)
// if streamConfigurationChanged {
// err := updateStreamConfiguration(pcfg.TCPEndpoints, pcfg.UDPEndpoints)
// if err != nil {
// return err
// }
// }
streamConfigurationChanged := !reflect.DeepEqual(n.runningConfig.TCPEndpoints, pcfg.TCPEndpoints) || !reflect.DeepEqual(n.runningConfig.UDPEndpoints, pcfg.UDPEndpoints)
if streamConfigurationChanged {
err := updateStreamConfiguration(pcfg.TCPEndpoints, pcfg.UDPEndpoints)
if err != nil {
return err
}
}
serversChanged := !reflect.DeepEqual(n.runningConfig.Servers, pcfg.Servers)
if serversChanged {