Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add type annotations for kr8s._auth #418

Merged
merged 3 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kr8s/_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ def __version__(self) -> str:
@property
def namespace(self) -> str:
"""Get the default namespace."""
assert self.auth.namespace
return self.auth.namespace

@namespace.setter
Expand Down
53 changes: 30 additions & 23 deletions kr8s/_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import pathlib
import ssl
from typing import Union
from typing import Optional, Union

import anyio

Expand All @@ -20,35 +20,42 @@ class KubeAuth:

def __init__(
self,
kubeconfig=None,
url=None,
serviceaccount=None,
namespace=None,
context=None,
kubeconfig: Optional[PathType] = None,
url: Optional[str] = None,
serviceaccount: Optional[str] = None,
namespace: Optional[str] = None,
context: Optional[str] = None,
) -> None:
self.server: str = None
self.client_cert_file: PathType = None
self.client_key_file: PathType = None
self.server_ca_file: PathType = None
self.token: str = None
self.namespace: str = namespace
self.active_context: str = None
self.kubeconfig: KubeConfigSet = None
self.tls_server_name: str = None
self._url: str = url
self.server: str = ""
self.client_cert_file: Optional[PathType] = None
self.client_key_file: Optional[PathType] = None
self.server_ca_file: Optional[PathType] = None
self.token: Optional[str] = None
self.namespace: Optional[str] = namespace
self.active_context: str = ""
self.kubeconfig: KubeConfigSet
self.tls_server_name: Optional[str] = None
self._url: str = ""
if url:
self._url = url
self._insecure_skip_tls_verify: bool = False
self._use_context: str = context
self._context: dict = None
self._cluster: dict = None
self._user: dict = None
self._use_context: Optional[str] = context
self._context: dict = {}
self._cluster: dict = {}
self._user: dict = {}
self._serviceaccount: str = (
serviceaccount
if serviceaccount is not None
else "/var/run/secrets/kubernetes.io/serviceaccount"
)
self._kubeconfig_path_or_dict: Union[dict, str, pathlib.Path] = (
kubeconfig or os.environ.get("KUBECONFIG", "~/.kube/config")
)
self._kubeconfig_path_or_dict: Union[dict, PathType]
if kubeconfig:
self._kubeconfig_path_or_dict = kubeconfig
else:
self._kubeconfig_path_or_dict = os.environ.get(
"KUBECONFIG", "~/.kube/config"
)

self.__auth_lock: anyio.Lock = anyio.Lock()

def __await__(self):
Expand Down
2 changes: 1 addition & 1 deletion kr8s/_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def get(


class KubeConfigSet(KubeConfigMixin, object):
def __init__(self, *paths_or_dicts: Union[str, Dict]):
def __init__(self, *paths_or_dicts: Union[PathType, Dict]):
self._configs = []
for path_or_dict in paths_or_dicts:
try:
Expand Down
Loading