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.

Sign up for GitHub

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

Jump to bottom

Add support for IPv6 in service account lookups #512

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Add support for IPv6 in service account lookups #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4846c
Add support for IPv6 in service account lookups
jacobtomlinson Nov 1, 2024
506f174
Use example from issue
jacobtomlinson Nov 1, 2024
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
16 changes: 13 additions & 3 deletions kr8s/_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-FileCopyrightText: Copyright (c) 2023-2024, Kr8s Developers (See LICENSE for list)
# SPDX-License-Identifier: BSD 3-Clause License
import base64
import ipaddress
import json
import os
import pathlib
Expand Down Expand Up @@ -256,9 +257,10 @@ async def _load_service_account(self) -> None:
self._serviceaccount = os.path.expanduser(self._serviceaccount)
if not os.path.isdir(self._serviceaccount):
return
host = os.environ["KUBERNETES_SERVICE_HOST"]
port = os.environ["KUBERNETES_SERVICE_PORT"]
self.server = f"https://{host}:{port}"
self.server = self._format_server_address(
os.environ["KUBERNETES_SERVICE_HOST"],
os.environ["KUBERNETES_SERVICE_PORT"],
)
async with await anyio.open_file(
os.path.join(self._serviceaccount, "token")
) as f:
Expand All @@ -269,3 +271,11 @@ async def _load_service_account(self) -> None:
os.path.join(self._serviceaccount, "namespace")
) as f:
self.namespace = await f.read()

@staticmethod
def _format_server_address(host, port):
try:
ipaddress.IPv6Address(host)
return f"https://[{host}]:{port}"
except ipaddress.AddressValueError:
return f"https://{host}:{port}"
14 changes: 14 additions & 0 deletions kr8s/tests/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import yaml

import kr8s
from kr8s._auth import KubeAuth
from kr8s._config import KubeConfig
from kr8s._testutils import set_env

Expand Down Expand Up @@ -317,3 +318,16 @@ async def test_certs_not_encoded(kubeconfig_with_decoded_certs):
async def test_certs_with_encoded_line_breaks(kubeconfig_with_line_breaks_in_certs):
api = await kr8s.asyncio.api(kubeconfig=kubeconfig_with_line_breaks_in_certs)
assert await api.get("pods", namespace=kr8s.ALL)


@pytest.mark.parametrize(
"host,port,expected",
[
("localhost", "8080", "https://localhost:8080"),
("9.9.9.9", "1234", "https://9.9.9.9:1234"),
("fd97:3495:4300::1", "443", "https://[fd97:3495:4300::1]:443"),
("kubernetes.default.svc", "8080", "https://kubernetes.default.svc:8080"),
],
)
def test_url_formatting(host, port, expected):
assert KubeAuth._format_server_address(host, port) == expected
Loading