From f0f8992b5a089cd97c9abe698fe9749e474cb312 Mon Sep 17 00:00:00 2001 From: tczekajlo Date: Tue, 27 Dec 2016 11:23:10 +0100 Subject: [PATCH] Use Kubernetes domain name from parameters The peer-finder.py uses constant domain name to Kubernetes API. It can be problematic in case where it's used other domain name than default one. --- mariadb/templates/configmaps/peer-finder.py.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mariadb/templates/configmaps/peer-finder.py.yaml.j2 b/mariadb/templates/configmaps/peer-finder.py.yaml.j2 index a3b7e4ea..e397012c 100644 --- a/mariadb/templates/configmaps/peer-finder.py.yaml.j2 +++ b/mariadb/templates/configmaps/peer-finder.py.yaml.j2 @@ -11,7 +11,7 @@ data: import time - URL = ('https://kubernetes.default.svc.cluster.local/api/v1/namespaces/{namespace}' + URL = ('https://kubernetes.default.svc.{{ network.dns.kubernetes_domain }}/api/v1/namespaces/{namespace}' '/endpoints/{service_name}') TOKEN_FILE = '/var/run/secrets/kubernetes.io/serviceaccount/token' @@ -49,7 +49,7 @@ data: def get_my_ip_address(): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect(('kubernetes.default.svc.cluster.local', 0)) + s.connect(('kubernetes.default.svc.{{ network.dns.kubernetes_domain }}', 0)) return s.getsockname()[0]