From 6ef9f6f5c090894fa453c68c448a8b4a9d32a630 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 20 Aug 2025 10:26:14 -0400 Subject: [PATCH] python-common/cephadm: reformat images.py with black Use the black formatter (with a single manual tweak) to reformat the images.py file. This formatting will be enforced by a future change. Signed-off-by: John Mulligan --- src/python-common/ceph/cephadm/images.py | 49 +++++++++++++++++------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py index ce4fbc78f71..43e377e405d 100644 --- a/src/python-common/ceph/cephadm/images.py +++ b/src/python-common/ceph/cephadm/images.py @@ -19,32 +19,53 @@ def _create_image(image_ref: str, key: str) -> ContainerImage: return ContainerImage( image_ref, f'{_img_prefix}{key}', - f'{description} container image' + f'{description} container image', ) class DefaultImages(Enum): - PROMETHEUS = _create_image('quay.io/prometheus/prometheus:v2.51.0', 'prometheus') + PROMETHEUS = _create_image( + 'quay.io/prometheus/prometheus:v2.51.0', 'prometheus' + ) LOKI = _create_image('docker.io/grafana/loki:3.0.0', 'loki') PROMTAIL = _create_image('docker.io/grafana/promtail:3.0.0', 'promtail') ALLOY = _create_image('docker.io/grafana/alloy:latest', 'alloy') - NODE_EXPORTER = _create_image('quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter') - ALERTMANAGER = _create_image('quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager') + NODE_EXPORTER = _create_image( + 'quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter' + ) + ALERTMANAGER = _create_image( + 'quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager' + ) GRAFANA = _create_image('quay.io/ceph/grafana:11.6.0', 'grafana') HAPROXY = _create_image('quay.io/ceph/haproxy:2.3', 'haproxy') KEEPALIVED = _create_image('quay.io/ceph/keepalived:2.2.4', 'keepalived') NVMEOF = _create_image('quay.io/ceph/nvmeof:1.5', 'nvmeof') - SNMP_GATEWAY = _create_image('docker.io/maxwo/snmp-notifier:v1.2.1', 'snmp_gateway') - ELASTICSEARCH = _create_image('quay.io/omrizeneva/elasticsearch:6.8.23', 'elasticsearch') - JAEGER_COLLECTOR = _create_image('quay.io/jaegertracing/jaeger-collector:1.29', - 'jaeger_collector') - JAEGER_AGENT = _create_image('quay.io/jaegertracing/jaeger-agent:1.29', 'jaeger_agent') - JAEGER_QUERY = _create_image('quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query') - SAMBA = _create_image('quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba') - SAMBA_METRICS = _create_image('quay.io/samba.org/samba-metrics:devbuilds-centos-amd64', - 'samba_metrics') + SNMP_GATEWAY = _create_image( + 'docker.io/maxwo/snmp-notifier:v1.2.1', 'snmp_gateway' + ) + ELASTICSEARCH = _create_image( + 'quay.io/omrizeneva/elasticsearch:6.8.23', 'elasticsearch' + ) + JAEGER_COLLECTOR = _create_image( + 'quay.io/jaegertracing/jaeger-collector:1.29', 'jaeger_collector' + ) + JAEGER_AGENT = _create_image( + 'quay.io/jaegertracing/jaeger-agent:1.29', 'jaeger_agent' + ) + JAEGER_QUERY = _create_image( + 'quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query' + ) + SAMBA = _create_image( + 'quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba' + ) + SAMBA_METRICS = _create_image( + 'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64', + 'samba_metrics', + ) NGINX = _create_image('quay.io/ceph/nginx:sclorg-nginx-126', 'nginx') - OAUTH2_PROXY = _create_image('quay.io/oauth2-proxy/oauth2-proxy:v7.6.0', 'oauth2_proxy') + OAUTH2_PROXY = _create_image( + 'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0', 'oauth2_proxy' + ) @property def image_ref(self) -> str: -- 2.39.5