From 7ae1c0ae32db3da01181cd5e92496a70cd59d38f Mon Sep 17 00:00:00 2001 From: Maxim Fedotov Date: Sat, 31 Oct 2020 15:10:08 +0300 Subject: [PATCH] issues/115. fix endpoint creation for services with selectors when servicesMetadata is specified for tenant (#116) apply review notes Co-authored-by: Maksim Fedotov --- pkg/webhook/service_labels/types.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/webhook/service_labels/types.go b/pkg/webhook/service_labels/types.go index e50bedbc..2c0a60f6 100644 --- a/pkg/webhook/service_labels/types.go +++ b/pkg/webhook/service_labels/types.go @@ -47,8 +47,13 @@ type Endpoints struct { *corev1.Endpoints } -func (ep Endpoints) Namespace() string { - return ep.GetNamespace() +func (ep Endpoints) Namespace() (namespace string) { + namespace = ep.GetNamespace() + // For ep, which are created automatically using service selector namespace will always be empty, so we had to take it from TargetRef + if len(namespace) == 0 { + namespace = ep.Subsets[0].Addresses[0].TargetRef.Namespace + } + return } func (ep Endpoints) Labels() map[string]string {