public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge bf9a220dd0 into a27727f8d0

This commit is contained in:
Nicolas Bachschmidt 2025-12-12 20:01:09 +01:00 committed by GitHub
parent a27727f8d0 bf9a220dd0
commit 14e90dabae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/operator_ui/cluster_discovery.py
View File

@ -24,14 +24,16 @@ def generate_cluster_id(url: str):
return CLUSTER_ID_INVALID_CHARS.sub('-', url.lower()).strip('-') return CLUSTER_ID_INVALID_CHARS.sub('-', url.lower()).strip('-')
class StaticAuthorizationHeaderAuth(AuthBase): class KubernetesConfigAuth(AuthBase):
'''Static authentication with given "Authorization" header''' '''Dynamic authentication using the Kubernetes configuration to load the service account token'''
def __init__(self, authorization): def __init__(self, config):
self.authorization = authorization self.config = config
def __call__(self, request): def __call__(self, request):
request.headers['Authorization'] = self.authorization authorization = self.config.get_api_key_with_prefix('authorization')
if authorization:
request.headers['Authorization'] = authorization
return request return request
@ -66,19 +68,20 @@ class StaticClusterDiscoverer:
if not api_server_urls: if not api_server_urls:
try: try:
kubernetes.config.load_incluster_config() config = kubernetes.client.Configuration()
kubernetes.config.load_incluster_config(config)
except kubernetes.config.ConfigException: except kubernetes.config.ConfigException:
# we are not running inside a cluster # we are not running inside a cluster
# => assume default kubectl proxy URL # => assume default kubectl proxy URL
cluster = Cluster(generate_cluster_id(DEFAULT_CLUSTERS), DEFAULT_CLUSTERS) cluster = Cluster(generate_cluster_id(DEFAULT_CLUSTERS), DEFAULT_CLUSTERS)
else: else:
logger.info("in cluster configuration failed") logger.info("in cluster configuration failed")
config = kubernetes.client.Configuration() auth = KubernetesConfigAuth(config)
cluster = Cluster( cluster = Cluster(
generate_cluster_id(config.host), generate_cluster_id(config.host),
config.host, config.host,
ssl_ca_cert=config.ssl_ca_cert, ssl_ca_cert=config.ssl_ca_cert,
auth=StaticAuthorizationHeaderAuth(config.api_key['authorization'])) auth=auth)
self._clusters.append(cluster) self._clusters.append(cluster)
else: else:
for api_server_url in api_server_urls: for api_server_url in api_server_urls:
@ -110,11 +113,7 @@ class KubeconfigDiscoverer:
continue continue
config = kubernetes.client.ConfigurationObject() config = kubernetes.client.ConfigurationObject()
kubernetes.config.load_kube_config(config_file, context=context['name'], client_configuration=config) kubernetes.config.load_kube_config(config_file, context=context['name'], client_configuration=config)
authorization = config.api_key.get('authorization') auth = KubernetesConfigAuth(config)
if authorization:
auth = StaticAuthorizationHeaderAuth(authorization)
else:
auth = None
cluster = Cluster( cluster = Cluster(
context['name'], context['name'],
config.host, config.host,

2
ui/requirements.txt
View File

@ -7,7 +7,7 @@ furl==2.1.3
gevent==24.2.1 gevent==24.2.1
jq==1.7.0 jq==1.7.0
json_delta>=2.0.2 json_delta>=2.0.2
kubernetes==11.0.0 kubernetes==34.1.0
python-json-logger==2.0.7 python-json-logger==2.0.7
requests==2.32.4 requests==2.32.4
stups-tokens>=1.1.19 stups-tokens>=1.1.19