Skip to content

Commit d1d5e2f

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

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
}
@@ -2622,7 +2622,7 @@ func (lbc *LoadBalancerController) createVirtualServerEx(virtualServer *conf_v1.
26222622
if u.UseClusterIP {
26232623
s, err := lbc.getServiceForUpstream(serviceNamespace, serviceName, u.Port)
26242624
if err != nil {
2625-
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v/%v: %v", serviceNamespace, serviceName, err)
2625+
nl.Warnf(lbc.Logger, "Error getting Service for Upstream %v: %v", u.Service, err)
26262626
} else {
26272627
endps = append(endps, fmt.Sprintf("%s:%d", s.Spec.ClusterIP, u.Port))
26282628
}
@@ -2949,7 +2949,7 @@ func (lbc *LoadBalancerController) getTransportServerBackupEndpointsAndKey(trans
29492949
func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, upstreamService string, upstreamPort uint16) (endps []podEndpoint, isExternal bool, err error) {
29502950
svc, err := lbc.getServiceForUpstream(namespace, upstreamService, upstreamPort)
29512951
if err != nil {
2952-
return nil, false, fmt.Errorf("error getting service %v/%v: %w", namespace, upstreamService, err)
2952+
return nil, false, fmt.Errorf("error getting service %v: %w", upstreamService, err)
29532953
}
29542954

29552955
backend := &networking.IngressBackend{
@@ -2963,7 +2963,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
29632963

29642964
endps, isExternal, err = lbc.getEndpointsForIngressBackend(backend, svc)
29652965
if err != nil {
2966-
return nil, false, fmt.Errorf("error retrieving endpoints for the service %v/%v: %w", namespace, upstreamService, err)
2966+
return nil, false, fmt.Errorf("error retrieving endpoints for the service %v: %w", upstreamService, err)
29672967
}
29682968

29692969
return endps, isExternal, err
@@ -2972,7 +2972,7 @@ func (lbc *LoadBalancerController) getEndpointsForUpstream(namespace string, ups
29722972
func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string, serviceName string, servicePort uint16, subselector map[string]string) (endps []podEndpoint, err error) {
29732973
svc, err := lbc.getServiceForUpstream(namespace, serviceName, servicePort)
29742974
if err != nil {
2975-
return nil, fmt.Errorf("error getting service %v/%v: %w", namespace, serviceName, err)
2975+
return nil, fmt.Errorf("error getting service %v: %w", serviceName, err)
29762976
}
29772977

29782978
var targetPort int32
@@ -2981,19 +2981,19 @@ func (lbc *LoadBalancerController) getEndpointsForSubselector(namespace string,
29812981
if port.Port == int32(servicePort) {
29822982
targetPort, err = lbc.getTargetPort(port, svc)
29832983
if err != nil {
2984-
return nil, fmt.Errorf("error determining target port for port %v in service %v/%v: %w", servicePort, svc.Namespace, svc.Name, err)
2984+
return nil, fmt.Errorf("error determining target port for port %v in service %v: %w", servicePort, svc.Name, err)
29852985
}
29862986
break
29872987
}
29882988
}
29892989

29902990
if targetPort == 0 {
2991-
return nil, fmt.Errorf("no port %v in service %s/%s", servicePort, svc.Namespace, svc.Name)
2991+
return nil, fmt.Errorf("no port %v in service %s", servicePort, svc.Name)
29922992
}
29932993

29942994
endps, err = lbc.getEndpointsForServiceWithSubselector(targetPort, subselector, svc)
29952995
if err != nil {
2996-
return nil, fmt.Errorf("error retrieving endpoints for the service %v/%v: %w", namespace, serviceName, err)
2996+
return nil, fmt.Errorf("error retrieving endpoints for the service %v: %w", serviceName, err)
29972997
}
29982998

29992999
return endps, err
@@ -3010,7 +3010,7 @@ func (lbc *LoadBalancerController) getEndpointsForServiceWithSubselector(targetP
30103010
var svcEndpointSlices []discovery_v1.EndpointSlice
30113011
svcEndpointSlices, err = nsi.endpointSliceLister.GetServiceEndpointSlices(svc)
30123012
if err != nil {
3013-
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s/%s from the cache: %v", svc.Namespace, svc.Name, err)
3013+
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s from the cache: %v", svc.Name, err)
30143014
return nil, err
30153015
}
30163016

@@ -3094,7 +3094,7 @@ func getPodName(pod *api_v1.ObjectReference) string {
30943094
func (lbc *LoadBalancerController) getHealthChecksForIngressBackend(backend *networking.IngressBackend, namespace string) *api_v1.Probe {
30953095
svc, err := lbc.getServiceForIngressBackend(backend, namespace)
30963096
if err != nil {
3097-
nl.Debugf(lbc.Logger, "Error getting service %v/%v: %v", namespace, backend.Service.Name, err)
3097+
nl.Debugf(lbc.Logger, "Error getting service %v: %v", backend.Service.Name, err)
30983098
return nil
30993099
}
31003100
svcPort := lbc.getServicePortForIngressPort(backend.Service.Port, svc)
@@ -3164,13 +3164,13 @@ func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *networ
31643164
result = lbc.getExternalEndpointsForIngressBackend(backend, svc)
31653165
return result, true, nil
31663166
}
3167-
nl.Debugf(lbc.Logger, "Error getting endpoints for service %s/%s from the cache: %v", svc.Namespace, svc.Name, err)
3167+
nl.Debugf(lbc.Logger, "Error getting endpoints for service %s from the cache: %v", svc.Name, err)
31683168
return nil, false, err
31693169
}
31703170

31713171
result, err = lbc.getEndpointsForPortFromEndpointSlices(endpointSlices, backend.Service.Port, svc)
31723172
if err != nil {
3173-
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s/%s port %v: %v", svc.Namespace, svc.Name, configs.GetBackendPortAsString(backend.Service.Port), err)
3173+
nl.Debugf(lbc.Logger, "Error getting endpointslices for service %s port %v: %v", svc.Name, configs.GetBackendPortAsString(backend.Service.Port), err)
31743174
return nil, false, err
31753175
}
31763176
return result, false, nil
@@ -3191,7 +3191,7 @@ func (lbc *LoadBalancerController) getEndpointsForPortFromEndpointSlices(endpoin
31913191
}
31923192

31933193
if targetPort == 0 {
3194-
return nil, fmt.Errorf("no port %v in service %s/%s", backendPort, svc.Namespace, svc.Name)
3194+
return nil, fmt.Errorf("no port %v in service %s", backendPort, svc.Name)
31953195
}
31963196

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

32183218
endpoints := makePodEndpoints(targetPort, filterReadyEndpointsFrom(selectEndpointSlicesForPort(targetPort, endpointSlices)))
32193219
if len(endpoints) == 0 {
3220-
return nil, fmt.Errorf("no endpointslices for target port %v in service %s/%s", targetPort, svc.Namespace, svc.Name)
3220+
return nil, fmt.Errorf("no endpointslices for target port %v in service %s", targetPort, svc.Name)
32213221
}
32223222
return endpoints, nil
32233223
}
@@ -3281,7 +3281,7 @@ func (lbc *LoadBalancerController) getTargetPort(svcPort api_v1.ServicePort, svc
32813281
}
32823282

32833283
if len(pods) == 0 {
3284-
return 0, fmt.Errorf("no pods of service %s/%s", svc.Namespace, svc.Name)
3284+
return 0, fmt.Errorf("no pods of service %s", svc.Name)
32853285
}
32863286

32873287
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,
@@ -107,17 +107,8 @@ def fin():
107107
indirect=True,
108108
)
109109
class TestVirtualServerForeignUpstream:
110-
def test_responses_after_setup(self, kube_apis,ingress_controller_prerequisites, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
110+
def test_responses_after_setup(self, kube_apis, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
111111
print(f"\nStep 1: initial check")
112-
ic_pod_name = get_first_pod_name(kube_apis.v1, ingress_controller_prerequisites.namespace)
113-
# log VS conf
114-
get_vs_nginx_template_conf(
115-
kube_apis.v1,
116-
virtual_server_foreign_upstream_app_setup.namespace,
117-
virtual_server_foreign_upstream_app_setup.vs_name,
118-
ic_pod_name,
119-
ingress_controller_prerequisites.namespace,
120-
)
121112
wait_before_test()
122113
wait_and_assert_status_code(
123114
200,

0 commit comments

Comments
 (0)