Skip to content

Commit 2b212ba

Browse files
author
Jim Ryan
authored
Reduce cyclomatic complexity in controller.go (#6373)
reduce cyclomatic complexity
1 parent 66cb364 commit 2b212ba

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

internal/k8s/controller.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,6 +3015,19 @@ func findPoliciesForSecret(policies []*conf_v1.Policy, secretNamespace string, s
30153015
return res
30163016
}
30173017

3018+
func (lbc *LoadBalancerController) getTransportServerBackupEndpointsAndKey(transportServer *conf_v1.TransportServer, u conf_v1.TransportServerUpstream, externalNameSvcs map[string]bool) ([]string, string) {
3019+
backupEndpointsKey := configs.GenerateEndpointsKey(transportServer.Namespace, u.Backup, nil, *u.BackupPort)
3020+
backupEndps, external, err := lbc.getEndpointsForUpstream(transportServer.Namespace, u.Backup, *u.BackupPort)
3021+
if err != nil {
3022+
glog.Warningf("Error getting Endpoints for Upstream %v: %v", u.Name, err)
3023+
}
3024+
if err == nil && external {
3025+
externalNameSvcs[configs.GenerateExternalNameSvcKey(transportServer.Namespace, u.Backup)] = true
3026+
}
3027+
bendps := getIPAddressesFromEndpoints(backupEndps)
3028+
return bendps, backupEndpointsKey
3029+
}
3030+
30183031
func (lbc *LoadBalancerController) createTransportServerEx(transportServer *conf_v1.TransportServer, listenerPort int) *configs.TransportServerEx {
30193032
endpoints := make(map[string][]string)
30203033
externalNameSvcs := make(map[string]bool)
@@ -3042,17 +3055,8 @@ func (lbc *LoadBalancerController) createTransportServerEx(transportServer *conf
30423055
}
30433056
}
30443057

3045-
// If backup defined on Upstream retrieve its external name and port.
30463058
if u.Backup != "" && u.BackupPort != nil {
3047-
backupEndpointsKey := configs.GenerateEndpointsKey(transportServer.Namespace, u.Backup, nil, *u.BackupPort)
3048-
backupEndps, external, err := lbc.getEndpointsForUpstream(transportServer.Namespace, u.Backup, *u.BackupPort)
3049-
if err != nil {
3050-
glog.Warningf("Error getting Endpoints for Upstream %v: %v", u.Name, err)
3051-
}
3052-
if err == nil && external {
3053-
externalNameSvcs[configs.GenerateExternalNameSvcKey(transportServer.Namespace, u.Backup)] = true
3054-
}
3055-
bendps := getIPAddressesFromEndpoints(backupEndps)
3059+
bendps, backupEndpointsKey := lbc.getTransportServerBackupEndpointsAndKey(transportServer, u, externalNameSvcs)
30563060
endpoints[backupEndpointsKey] = bendps
30573061
}
30583062
}

0 commit comments

Comments
 (0)