From e819f4b4b1bfe35cbb18b1a0e0d21579c8e06d71 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Fri, 28 Jun 2019 15:08:20 +0200 Subject: [PATCH] Allow nodepool for using in-cluster configs When running within a kubernetes cluster, it's easier to configure a service account and mounting it on the nodepool POD than creating a kubeconfig file and making it available to nodepool. For this reason, this commit adds the ability to load configs from the in-cluster service account paths. It does this as a fallback when the kubeconfig path doesn't exist. This commit also makes `context` a non required configuration option, since it's not needed when a service account is used. Change-Id: I7762940993c185c17d7468df72dff22e99d7f8c2 --- nodepool/driver/kubernetes/config.py | 2 +- nodepool/driver/kubernetes/provider.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nodepool/driver/kubernetes/config.py b/nodepool/driver/kubernetes/config.py index 7223ebdc4..221613493 100644 --- a/nodepool/driver/kubernetes/config.py +++ b/nodepool/driver/kubernetes/config.py @@ -109,7 +109,7 @@ class KubernetesProviderConfig(ProviderConfig): provider = { v.Required('pools'): [pool], - v.Required('context'): str, + 'context': str, 'launch-retries': int, } diff --git a/nodepool/driver/kubernetes/provider.py b/nodepool/driver/kubernetes/provider.py index 636cf1b56..268d02105 100644 --- a/nodepool/driver/kubernetes/provider.py +++ b/nodepool/driver/kubernetes/provider.py @@ -49,7 +49,13 @@ class KubernetesProvider(Provider): self.namespace_names.add(pool.name) def _get_client(self, context): - conf = config.new_client_from_config(context=context) + try: + conf = config.new_client_from_config(context=context) + except FileNotFoundError: + self.log.debug("Kubernetes config file not found, attempting " + "to load in-cluster configs") + conf = config.load_incluster_config() + return ( k8s_client.CoreV1Api(conf), k8s_client.RbacAuthorizationV1beta1Api(conf))