From 99a25fed196b6267e55769e7344693f500a366cf Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Wed, 22 Nov 2017 09:45:23 +0200 Subject: [PATCH] Lowercase hostnames when used as node names in k8s --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index d43f06768a8..5b875c4d25f 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -157,7 +157,7 @@ def shutdown(): ''' try: if os.path.isfile(kubeconfig_path): - kubectl('delete', 'node', gethostname()) + kubectl('delete', 'node', gethostname().lower()) except CalledProcessError: hookenv.log('Failed to unregister node.') service_stop('snap.kubelet.daemon') @@ -906,7 +906,8 @@ class ApplyNodeLabelFailed(Exception): def _apply_node_label(label, delete=False, overwrite=False): ''' Invoke kubectl to apply node label changes ''' - hostname = gethostname() + # k8s lowercases hostnames and uses them as node names + hostname = gethostname().lower() # TODO: Make this part of the kubectl calls instead of a special string cmd_base = 'kubectl --kubeconfig={0} label node {1} {2}'