Skip to content

Commit 5556918

Browse files
haywoodshhaywoodsh
committed
revert debug changes
Signed-off-by: Haywood Shannon <[email protected]> Signed-off-by: Haywood Shannon <[email protected]>
1 parent ed738bf commit 5556918

File tree

2 files changed

+22
-31
lines changed

2 files changed

+22
-31
lines changed

‎internal/k8s/controller.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,7 +2242,7 @@ func (lbc *LoadBalancerController) createIngressEx(ing *networking.Ingress, vali
22422242
var external bool
22432243
svc, err := lbc.getServiceForIngressBackend(ing.Spec.DefaultBackend, ing.Namespace)
22442244
if err != nil {
2245-
nl.Warnf(lbc.Logger, "Error getting service %v/%v: %v", ing.Namespace, ing.Spec.DefaultBackend.Service.Name, err)
2245+
nl.Warnf(lbc.Logger, "Error getting service %v: %v", ing.Spec.DefaultBackend.Service.Name, err)
22462246
} else {
22472247
podEndps, external, err = lbc.getEndpointsForIngressBackend(ing.Spec.DefaultBackend, svc)
22482248
if err == nil && external && lbc.isNginxPlus {
@@ -2251,7 +2251,7 @@ func (lbc *LoadBalancerController) createIngressEx(ing *networking.Ingress, vali
22512251
}
22522252

22532253
if err != nil {
2254-
nl.Warnf(lbc.Logger, "Error retrieving endpoints for the service %v/%v: %v", ing.Namespace, ing.Spec.DefaultBackend.Service.Name, err)
2254+
nl.Warnf(lbc.Logger, "Error retrieving endpoints for the service %v: %v", ing.Spec.DefaultBackend.Service.Name, err)
22552255
}
22562256

22572257
if svc != nil && !external && hasUseClusterIP {
@@ -2310,7 +2310,7 @@ func (lbc *LoadBalancerController) createIngressEx(ing *networking.Ingress, vali
23102310
var external bool
23112311
svc, err := lbc.getServiceForIngressBackend(&path.Backend, ing.Namespace)
23122312
if err != nil {
2313-
nl.Debugf(lbc.Logger, "Error getting service %v/%v: %v", ing.Namespace, path.Backend.Service.Name, err)
2313+
nl.Debugf(lbc.Logger, "Error getting service %v: %v", &path.Backend.Service.Name, err)
23142314
} else {
23152315
podEndps, external, err = lbc.getEndpointsForIngressBackend(&path.Backend, svc)
23162316
if err == nil && external && lbc.isNginxPlus {
@@ -2319,7 +2319,7 @@ func (lbc *LoadBalancerController) createIngressEx(ing *networking.Ingress, vali
23192319
}
23202320

23212321
if err != nil {
2322-
nl.Warnf(lbc.Logger, "Error retrieving endpoints for the service %v/%v: %v", ing.Namespace, path.Backend.Service.Name, err)
2322+
nl.Warnf(lbc.Logger, "Error retrieving endpoints for the service %v: %v", path.Backend.Service.Name, err)
23232323
}
23242324

23252325
if svc != nil && !external && hasUseClusterIP {
@@ -2474,7 +2474,7 @@ func (lbc *LoadBalancerController) createVirtualServerEx(virtualServer *conf_v1.
24742474
if u.UseClusterIP {
24752475
s, err := lbc.getServiceForUpstream(serviceNamespace, serviceName, u.Port)
24762476
if err != nil {
2477-
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v/%v: %v", serviceNamespace, u.Service, err)
2477+
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v: %v", u.Service, err)
24782478
} else {
24792479
endps = append(endps, ipv6SafeAddrPort(s.Spec.ClusterIP, int32(u.Port)))
24802480
}
@@ -2632,7 +2632,7 @@ func (lbc *LoadBalancerController) createVirtualServerEx(virtualServer *conf_v1.
26322632
if u.UseClusterIP {
26332633
s, err := lbc.getServiceForUpstream(serviceNamespace, serviceName, u.Port)
26342634
if err != nil {
2635-
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v/%v: %v", serviceNamespace, serviceName, err)
2635+
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v: %v", u.Service, err)
26362636
} else {
26372637
endps = append(endps, fmt.Sprintf("%s:%d", s.Spec.ClusterIP, u.Port))
26382638
}
@@ -2981,7 +2981,7 @@ func (lbc *LoadBalancerController) getTransportServerBackupEndpointsAndKey(trans
29812981
func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, upstreamService string, upstreamPort uint16) (endps []podEndpoint, isExternal bool, err error) {
29822982
svc, err := lbc.getServiceForUpstream(namespace, upstreamService, upstreamPort)
29832983
if err != nil {
2984-
return nil, false, fmt.Errorf("error getting service %v/%v: %w", namespace, upstreamService, err)
2984+
return nil, false, fmt.Errorf("error getting service %v: %w", upstreamService, err)
29852985
}
29862986

29872987
backend := &networking.IngressBackend{
@@ -2995,7 +2995,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
29952995

29962996
endps, isExternal, err = lbc.getEndpointsForIngressBackend(backend, svc)
29972997
if err != nil {
2998-
return nil, false, fmt.Errorf("error retrieving endpoints for the service %v/%v: %w", namespace, upstreamService, err)
2998+
return nil, false, fmt.Errorf("error retrieving endpoints for the service %v: %w", upstreamService, err)
29992999
}
30003000

30013001
return endps, isExternal, err
@@ -3004,7 +3004,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
30043004
func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string, serviceName string, servicePort uint16, subselector map[string]string) (endps []podEndpoint, err error) {
30053005
svc, err := lbc.getServiceForUpstream(namespace, serviceName, servicePort)
30063006
if err != nil {
3007-
return nil, fmt.Errorf("error getting service %v/%v: %w", namespace, serviceName, err)
3007+
return nil, fmt.Errorf("error getting service %v: %w", serviceName, err)
30083008
}
30093009

30103010
var targetPort int32
@@ -3013,19 +3013,19 @@ func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string,
30133013
if port.Port == int32(servicePort) {
30143014
targetPort, err = lbc.getTargetPort(port, svc)
30153015
if err != nil {
3016-
return nil, fmt.Errorf("error determining target port for port %v in service %v/%v: %w", servicePort, svc.Namespace, svc.Name, err)
3016+
return nil, fmt.Errorf("error determining target port for port %v in service %v: %w", servicePort, svc.Name, err)
30173017
}
30183018
break
30193019
}
30203020
}
30213021

30223022
if targetPort == 0 {
3023-
return nil, fmt.Errorf("no port %v in service %s/%s", servicePort, svc.Namespace, svc.Name)
3023+
return nil, fmt.Errorf("no port %v in service %s", servicePort, svc.Name)
30243024
}
30253025

30263026
endps, err = lbc.getEndpointsForServiceWithSubselector(targetPort, subselector, svc)
30273027
if err != nil {
3028-
return nil, fmt.Errorf("error retrieving endpoints for the service %v/%v: %w", namespace, serviceName, err)
3028+
return nil, fmt.Errorf("error retrieving endpoints for the service %v: %w", serviceName, err)
30293029
}
30303030

30313031
return endps, err
@@ -3042,7 +3042,7 @@ func (lbc *LoadBalancerController) getEndpointsForServiceWithSubselector(targetP
30423042
var svcEndpointSlices []discovery_v1.EndpointSlice
30433043
svcEndpointSlices, err = nsi.endpointSliceLister.GetServiceEndpointSlices(svc)
30443044
if err != nil {
3045-
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s/%s from the cache: %v", svc.Namespace, svc.Name, err)
3045+
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s from the cache: %v", svc.Name, err)
30463046
return nil, err
30473047
}
30483048

@@ -3126,7 +3126,7 @@ func getPodName(pod *api_v1.ObjectReference) string {
31263126
func (lbc *LoadBalancerController) getHealthChecksForIngressBackend(backend *networking.IngressBackend, namespace string) *api_v1.Probe {
31273127
svc, err := lbc.getServiceForIngressBackend(backend, namespace)
31283128
if err != nil {
3129-
nl.Debugf(lbc.Logger, "Error getting service %v/%v: %v", namespace, backend.Service.Name, err)
3129+
nl.Debugf(lbc.Logger, "Error getting service %v: %v", backend.Service.Name, err)
31303130
return nil
31313131
}
31323132
svcPort := lbc.getServicePortForIngressPort(backend.Service.Port, svc)
@@ -3196,13 +3196,13 @@ func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *networ
31963196
result = lbc.getExternalEndpointsForIngressBackend(backend, svc)
31973197
return result, true, nil
31983198
}
3199-
nl.Debugf(lbc.Logger, "Error getting endpoints for service %s/%s from the cache: %v", svc.Namespace, svc.Name, err)
3199+
nl.Debugf(lbc.Logger, "Error getting endpoints for service %s from the cache: %v", svc.Name, err)
32003200
return nil, false, err
32013201
}
32023202

32033203
result, err = lbc.getEndpointsForPortFromEndpointSlices(endpointSlices, backend.Service.Port, svc)
32043204
if err != nil {
3205-
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s/%s port %v: %v", svc.Namespace, svc.Name, configs.GetBackendPortAsString(backend.Service.Port), err)
3205+
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s port %v: %v", svc.Name, configs.GetBackendPortAsString(backend.Service.Port), err)
32063206
return nil, false, err
32073207
}
32083208
return result, false, nil
@@ -3223,7 +3223,7 @@ func (lbc *LoadBalancerController) getEndpointsForPortFromEndpointSlices(endpoin
32233223
}
32243224

32253225
if targetPort == 0 {
3226-
return nil, fmt.Errorf("no port %v in service %s/%s", backendPort, svc.Namespace, svc.Name)
3226+
return nil, fmt.Errorf("no port %v in service %s", backendPort, svc.Name)
32273227
}
32283228

32293229
makePodEndpoints := func(port int32, epx []discovery_v1.Endpoint) []podEndpoint {
@@ -3249,7 +3249,7 @@ func (lbc *LoadBalancerController) getEndpointsForPortFromEndpointSlices(endpoin
32493249

32503250
endpoints := makePodEndpoints(targetPort, filterReadyEndpointsFrom(selectEndpointSlicesForPort(targetPort, endpointSlices)))
32513251
if len(endpoints) == 0 {
3252-
return nil, fmt.Errorf("no endpointslices for target port %v in service %s/%s", targetPort, svc.Namespace, svc.Name)
3252+
return nil, fmt.Errorf("no endpointslices for target port %v in service %s", targetPort, svc.Name)
32533253
}
32543254
return endpoints, nil
32553255
}
@@ -3313,7 +3313,7 @@ func (lbc *LoadBalancerController) getTargetPort(svcPort api_v1.ServicePort, svc
33133313
}
33143314

33153315
if len(pods) == 0 {
3316-
return 0, fmt.Errorf("no pods of service %s/%s", svc.Namespace, svc.Name)
3316+
return 0, fmt.Errorf("no pods of service %s", svc.Name)
33173317
}
33183318

33193319
pod := pods[0]

‎tests/suite/test_virtual_server_foreign_upstream.py‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
delete_items_from_yaml,
99
delete_namespace,
1010
wait_before_test,
11-
wait_until_all_pods_are_ready, get_first_pod_name,
11+
wait_until_all_pods_are_ready,
1212
)
1313
from suite.utils.vs_vsr_resources_utils import (
1414
create_v_s_route_from_yaml,
1515
create_virtual_server_from_yaml,
1616
delete_v_s_route,
1717
delete_virtual_server,
18-
patch_virtual_server_from_yaml, get_vs_nginx_template_conf,
18+
patch_virtual_server_from_yaml,
1919
)
2020
from suite.utils.yaml_utils import (
2121
get_first_host_from_yaml,
@@ -108,17 +108,8 @@ def fin():
108108
indirect=True,
109109
)
110110
class TestVirtualServerForeignUpstream:
111-
def test_responses_after_setup(self, kube_apis,ingress_controller_prerequisites, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
111+
def test_responses_after_setup(self, kube_apis, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
112112
print(f"\nStep 1: initial check")
113-
ic_pod_name = get_first_pod_name(kube_apis.v1, ingress_controller_prerequisites.namespace)
114-
# log VS conf
115-
get_vs_nginx_template_conf(
116-
kube_apis.v1,
117-
virtual_server_foreign_upstream_app_setup.namespace,
118-
virtual_server_foreign_upstream_app_setup.vs_name,
119-
ic_pod_name,
120-
ingress_controller_prerequisites.namespace,
121-
)
122113
wait_before_test()
123114
wait_and_assert_status_code(
124115
200,

0 commit comments

Comments
 (0)