From bd4a986ac5eda410e15789787d27b9d4dc10b191 Mon Sep 17 00:00:00 2001 From: Gavin Bunney <409207+gavinbunney@users.noreply.github.com> Date: Thu, 30 Apr 2020 13:27:01 -0700 Subject: [PATCH] Allow overriding default cluster name --- README.rst | 1 + kube_resource_report/cluster_discovery.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 815c5ab..823283d 100644 --- a/README.rst +++ b/README.rst @@ -215,6 +215,7 @@ You can run ``docker run --rm hjacobs/kube-resource-report:20.4.4 --help`` to fi Besides this, you can also pass environment variables: +- ``DEFAULT_CLUSTER_NAME`` (default: ``"cluster"``) - ``NODE_LABEL_SPOT`` (default: ``"aws.amazon.com/spot"``) - ``NODE_LABEL_SPOT_VALUE`` (default: ``"true"``) - ``NODE_LABEL_PREEMPTIBLE`` (default: ``cloud.google.com/gke-preemptible``) diff --git a/kube_resource_report/cluster_discovery.py b/kube_resource_report/cluster_discovery.py index c21a61d..6a5d483 100644 --- a/kube_resource_report/cluster_discovery.py +++ b/kube_resource_report/cluster_discovery.py @@ -1,4 +1,5 @@ import logging +import os import re import time from pathlib import Path @@ -13,6 +14,7 @@ # default URL points to kubectl proxy DEFAULT_CLUSTERS = "http://localhost:8001/" +DEFAULT_CLUSTER_NAME = os.environ.get("DEFAULT_CLUSTER_NAME", "cluster") CLUSTER_ID_INVALID_CHARS = re.compile("[^a-z0-9:-]") logger = logging.getLogger(__name__) @@ -64,7 +66,7 @@ def __init__(self, api_server_urls: list): client = HTTPClient(config) cluster = Cluster( generate_cluster_id(DEFAULT_CLUSTERS), - "cluster", + DEFAULT_CLUSTER_NAME, DEFAULT_CLUSTERS, client, ) @@ -72,7 +74,7 @@ def __init__(self, api_server_urls: list): client = HTTPClient(config) cluster = Cluster( generate_cluster_id(config.cluster["server"]), - "cluster", + DEFAULT_CLUSTER_NAME, config.cluster["server"], client, )