Custom kubelet port (#154)

* Added KubeConfig.kubelet_node_port * Patched chart * Fixed linting issues * Addressed an issue in the chart
neuro-inc · Mar 5, 2020 · ba1ae7f · ba1ae7f
1 parent effe3f5
commit ba1ae7f
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 8 deletions.
diff --git a/deploy/platformmonitoringapi/templates/platformmonitoring.gke.yml b/deploy/platformmonitoringapi/templates/platformmonitoring.gke.yml
@@ -59,6 +59,8 @@ spec:
           value: {{ .Values.NP_MONITORING_REGISTRY_URL }}
         - name: NP_CLUSTER_NAME
           value: {{ .Values.NP_CLUSTER_NAME }}
+        - name: NP_MONITORING_K8S_KUBELET_PORT
+          value: {{ .Values.NP_MONITORING_K8S_KUBELET_PORT | quote }}
       {{- if .Values.DOCKER_LOGIN_ARTIFACTORY_SECRET_NAME }}
       imagePullSecrets:
         - name: {{ .Values.DOCKER_LOGIN_ARTIFACTORY_SECRET_NAME }}

diff --git a/deploy/platformmonitoringapi/values-dev.yaml b/deploy/platformmonitoringapi/values-dev.yaml
@@ -10,3 +10,4 @@ NP_MONITORING_ES_HOSTS: http://logging-elasticsearch:9200
 NP_MONITORING_K8S_NS: default
 NP_MONITORING_REGISTRY_URL: https://registry-dev.neu.ro
 NP_CLUSTER_NAME: "default"
+NP_MONITORING_K8S_KUBELET_PORT: ""
diff --git a/deploy/platformmonitoringapi/values-staging.yaml b/deploy/platformmonitoringapi/values-staging.yaml
@@ -10,3 +10,4 @@ NP_MONITORING_ES_HOSTS: http://logging-elasticsearch:9200
 NP_MONITORING_K8S_NS: default
 NP_MONITORING_REGISTRY_URL: https://registry-staging.neu.ro
 NP_CLUSTER_NAME: ""
+NP_MONITORING_K8S_KUBELET_PORT: ""
diff --git a/deploy/platformmonitoringapi/values-template.yaml b/deploy/platformmonitoringapi/values-template.yaml
@@ -11,3 +11,4 @@ NP_MONITORING_K8S_NS: default
 NP_MONITORING_REGISTRY_URL: https://
 DOCKER_LOGIN_ARTIFACTORY_SECRET_NAME: "artifactory-regcred"
 NP_CLUSTER_NAME: ""
+NP_MONITORING_K8S_KUBELET_PORT: ""
diff --git a/platform_monitoring/api.py b/platform_monitoring/api.py
@@ -337,6 +337,7 @@ async def create_kube_client(config: KubeConfig) -> AsyncIterator[KubeClient]:
         conn_timeout_s=config.client_conn_timeout_s,
         read_timeout_s=config.client_read_timeout_s,
         conn_pool_size=config.client_conn_pool_size,
+        kubelet_node_port=config.kubelet_node_port,
     )
     try:
         await client.init()

diff --git a/platform_monitoring/config.py b/platform_monitoring/config.py
@@ -48,6 +48,8 @@ class KubeConfig:
     client_read_timeout_s: int = 300
     client_conn_pool_size: int = 100
 
+    kubelet_node_port: int = 10255
+
 
 @dataclass(frozen=True)
 class RegistryConfig:

diff --git a/platform_monitoring/config_factory.py b/platform_monitoring/config_factory.py
@@ -90,6 +90,10 @@ def _create_kube(self) -> KubeConfig:
                 self._environ.get("NP_MONITORING_K8S_CLIENT_CONN_POOL_SIZE")
                 or KubeConfig.client_conn_pool_size
             ),
+            kubelet_node_port=int(
+                self._environ.get("NP_MONITORING_K8S_KUBELET_PORT")
+                or KubeConfig.kubelet_node_port
+            ),
         )
 
     def _create_registry(self) -> RegistryConfig:

diff --git a/platform_monitoring/kube_client.py b/platform_monitoring/kube_client.py
@@ -13,15 +13,12 @@
 from yarl import URL
 
 from .base import JobStats, Telemetry
-from .config import KubeClientAuthType
+from .config import KubeClientAuthType, KubeConfig
 
 
 logger = logging.getLogger(__name__)
 
 
-KUBELET_NODE_PORT = 10255
-
-
 class KubeClientException(Exception):
     pass
 
@@ -91,6 +88,7 @@ def __init__(
         conn_timeout_s: int = 300,
         read_timeout_s: int = 100,
         conn_pool_size: int = 100,
+        kubelet_node_port: int = KubeConfig.kubelet_node_port,
     ) -> None:
         self._base_url = base_url
         self._namespace = namespace
@@ -109,7 +107,7 @@ def __init__(
         self._conn_pool_size = conn_pool_size
         self._client: Optional[aiohttp.ClientSession] = None
 
-        self._kubelet_port = KUBELET_NODE_PORT
+        self._kubelet_port = kubelet_node_port
 
     @property
     def _is_ssl(self) -> bool:

diff --git a/tests/integration/test_kube.py b/tests/integration/test_kube.py
@@ -12,7 +12,6 @@
 from platform_monitoring.base import LogReader
 from platform_monitoring.config import KubeConfig
 from platform_monitoring.kube_client import (
-    KUBELET_NODE_PORT,
     JobNotFoundException,
     KubeClient,
     KubeClientException,
@@ -235,11 +234,11 @@ async def test_get_node_proxy_client(
         node_list = await kube_client.get_node_list()
         node_name = node_list["items"][0]["metadata"]["name"]
         async with kube_client.get_node_proxy_client(
-            node_name, KUBELET_NODE_PORT
+            node_name, KubeConfig.kubelet_node_port
         ) as client:
             assert client.url == URL(
                 kube_config.endpoint_url
-                + f"/api/v1/nodes/{node_name}:{KUBELET_NODE_PORT}/proxy"
+                + f"/api/v1/nodes/{node_name}:{KubeConfig.kubelet_node_port}/proxy"
             )
 
             async with client.session.get(URL(f"{client.url}/stats/summary")) as resp:

diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -58,6 +58,7 @@ def test_create(cert_authority_path: str, token_path: str) -> None:
         "NP_MONITORING_K8S_CLIENT_CONN_POOL_SIZE": "333",
         "NP_MONITORING_REGISTRY_URL": "http://testhost:5000",
         "NP_CLUSTER_NAME": "default",
+        "NP_MONITORING_K8S_KUBELET_PORT": "12321",
     }
     config = EnvironConfigFactory(environ).create()
     assert config == Config(
@@ -80,6 +81,7 @@ def test_create(cert_authority_path: str, token_path: str) -> None:
             client_conn_timeout_s=111,
             client_read_timeout_s=222,
             client_conn_pool_size=333,
+            kubelet_node_port=12321,
         ),
         registry=RegistryConfig(url=URL("http://testhost:5000")),
         docker=DockerConfig(),