Skip to content

Commit 6ef9f6f

Browse files
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 <[email protected]>
1 parent 9767192 commit 6ef9f6f

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

src/python-common/ceph/cephadm/images.py

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,53 @@ def _create_image(image_ref: str, key: str) -> ContainerImage:
1919
return ContainerImage(
2020
image_ref,
2121
f'{_img_prefix}{key}',
22-
f'{description} container image'
22+
f'{description} container image',
2323
)
2424

2525

2626
class DefaultImages(Enum):
27-
PROMETHEUS = _create_image('quay.io/prometheus/prometheus:v2.51.0', 'prometheus')
27+
PROMETHEUS = _create_image(
28+
'quay.io/prometheus/prometheus:v2.51.0', 'prometheus'
29+
)
2830
LOKI = _create_image('docker.io/grafana/loki:3.0.0', 'loki')
2931
PROMTAIL = _create_image('docker.io/grafana/promtail:3.0.0', 'promtail')
3032
ALLOY = _create_image('docker.io/grafana/alloy:latest', 'alloy')
31-
NODE_EXPORTER = _create_image('quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter')
32-
ALERTMANAGER = _create_image('quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager')
33+
NODE_EXPORTER = _create_image(
34+
'quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter'
35+
)
36+
ALERTMANAGER = _create_image(
37+
'quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager'
38+
)
3339
GRAFANA = _create_image('quay.io/ceph/grafana:11.6.0', 'grafana')
3440
HAPROXY = _create_image('quay.io/ceph/haproxy:2.3', 'haproxy')
3541
KEEPALIVED = _create_image('quay.io/ceph/keepalived:2.2.4', 'keepalived')
3642
NVMEOF = _create_image('quay.io/ceph/nvmeof:1.5', 'nvmeof')
37-
SNMP_GATEWAY = _create_image('docker.io/maxwo/snmp-notifier:v1.2.1', 'snmp_gateway')
38-
ELASTICSEARCH = _create_image('quay.io/omrizeneva/elasticsearch:6.8.23', 'elasticsearch')
39-
JAEGER_COLLECTOR = _create_image('quay.io/jaegertracing/jaeger-collector:1.29',
40-
'jaeger_collector')
41-
JAEGER_AGENT = _create_image('quay.io/jaegertracing/jaeger-agent:1.29', 'jaeger_agent')
42-
JAEGER_QUERY = _create_image('quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query')
43-
SAMBA = _create_image('quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba')
44-
SAMBA_METRICS = _create_image('quay.io/samba.org/samba-metrics:devbuilds-centos-amd64',
45-
'samba_metrics')
43+
SNMP_GATEWAY = _create_image(
44+
'docker.io/maxwo/snmp-notifier:v1.2.1', 'snmp_gateway'
45+
)
46+
ELASTICSEARCH = _create_image(
47+
'quay.io/omrizeneva/elasticsearch:6.8.23', 'elasticsearch'
48+
)
49+
JAEGER_COLLECTOR = _create_image(
50+
'quay.io/jaegertracing/jaeger-collector:1.29', 'jaeger_collector'
51+
)
52+
JAEGER_AGENT = _create_image(
53+
'quay.io/jaegertracing/jaeger-agent:1.29', 'jaeger_agent'
54+
)
55+
JAEGER_QUERY = _create_image(
56+
'quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query'
57+
)
58+
SAMBA = _create_image(
59+
'quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba'
60+
)
61+
SAMBA_METRICS = _create_image(
62+
'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64',
63+
'samba_metrics',
64+
)
4665
NGINX = _create_image('quay.io/ceph/nginx:sclorg-nginx-126', 'nginx')
47-
OAUTH2_PROXY = _create_image('quay.io/oauth2-proxy/oauth2-proxy:v7.6.0', 'oauth2_proxy')
66+
OAUTH2_PROXY = _create_image(
67+
'quay.io/oauth2-proxy/oauth2-proxy:v7.6.0', 'oauth2_proxy'
68+
)
4869

4970
@property
5071
def image_ref(self) -> str:

0 commit comments

Comments
 (0)