From d8e38619919792f59b62b5dd2b221b356700418a Mon Sep 17 00:00:00 2001 From: Rye Terrell Date: Tue, 19 Dec 2017 07:48:16 -0600 Subject: [PATCH] Use old dns-ip mechanism with older cdk-addons. --- .../kubernetes-master/reactive/kubernetes_master.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index d7ca9beed86..97f2120ffca 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -572,6 +572,7 @@ def configure_cdk_addons(): dnsEnabled = str(hookenv.config('enable-kube-dns')).lower() args = [ 'arch=' + arch(), + 'dns-ip=' + get_deprecated_dns_ip(), 'dns-domain=' + hookenv.config('dns_domain'), 'enable-dashboard=' + dbEnabled, 'enable-kube-dns=' + dnsEnabled @@ -964,6 +965,14 @@ def get_dns_ip(): return svc['spec']['clusterIP'] +def get_deprecated_dns_ip(): + '''We previously hardcoded the dns ip. This function returns the old + hardcoded value for use with older versions of cdk_addons.''' + interface = ipaddress.IPv4Interface(service_cidr()) + ip = interface.network.network_address + 10 + return ip.exploded + + def get_kubernetes_service_ip(): '''Get the IP address for the kubernetes service based on the cidr.''' interface = ipaddress.IPv4Interface(service_cidr())