Merge pull request #591 from bunkerity/dev

k8s - use same namespace as ingress for services
This commit is contained in:
Théophile Diot 2023-08-08 12:49:42 -04:00 committed by GitHub
commit 47c560dd30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -73,7 +73,7 @@ class IngressController(Controller):
def _to_services(self, controller_service) -> List[dict]:
if not controller_service.spec or not controller_service.spec.rules:
return []
namespace = controller_service.metadata.namespace
services = []
# parse rules
for rule in controller_service.spec.rules:
@ -112,7 +112,7 @@ class IngressController(Controller):
service_list = self.__corev1.list_service_for_all_namespaces(
watch=False,
field_selector=f"metadata.name={path.backend.service.name}",
field_selector=f"metadata.name={path.backend.service.name},metadata.namespace={namespace}",
).items
if not service_list:
@ -121,7 +121,7 @@ class IngressController(Controller):
)
continue
reverse_proxy_host = f"http://{path.backend.service.name}.{service_list[0].metadata.namespace}.svc.cluster.local:{path.backend.service.port.number}"
reverse_proxy_host = f"http://{path.backend.service.name}.{namespace}.svc.cluster.local:{path.backend.service.port.number}"
service.update(
{
"USE_REVERSE_PROXY": "yes",