Skip to content

Commit e909924

Browse files
authored
Merge pull request ceph#60260 from ShwetaBhosale1/new_cephadm_command_to_list_default_images
cephadm: Added cephadm command to list all the default images Reviewed-by: Adam King <[email protected]> Reviewed-by: John Mulligan <[email protected]>
2 parents 20af41d + f7a379f commit e909924

File tree

2 files changed

+61
-1
lines changed

2 files changed

+61
-1
lines changed

src/cephadm/cephadm.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from io import StringIO
3030
from threading import Thread, Event
3131
from pathlib import Path
32+
from configparser import ConfigParser
3233

3334
from cephadmlib.constants import (
3435
# default images
@@ -142,6 +143,7 @@
142143
SidecarContainer,
143144
extract_uid_gid,
144145
is_container_running,
146+
get_mgr_images,
145147
)
146148
from cephadmlib.decorators import (
147149
deprecated_command,
@@ -4679,6 +4681,13 @@ def probe_hba(scan_path: str) -> None:
46794681
return f'Ok. {len(all_scan_files)} adapters detected: {len(scan_files)} rescanned, {len(skipped)} skipped, {len(failures)} failed ({elapsed:.2f}s)'
46804682

46814683

4684+
def command_list_images(ctx: CephadmContext) -> None:
4685+
"""this function will list the default images used by different services"""
4686+
cp_obj = ConfigParser()
4687+
cp_obj['mgr'] = get_mgr_images()
4688+
# print default images
4689+
cp_obj.write(sys.stdout)
4690+
46824691
##################################
46834692

46844693

@@ -5542,6 +5551,9 @@ def _get_parser():
55425551
'disk-rescan', help='rescan all HBAs to detect new/removed devices')
55435552
parser_disk_rescan.set_defaults(func=command_rescan_disks)
55445553

5554+
parser_list_images = subparsers.add_parser(
5555+
'list-images', help='list all the default images')
5556+
parser_list_images.set_defaults(func=command_list_images)
55455557
return parser
55465558

55475559

src/cephadm/cephadmlib/container_types.py

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,28 @@
88
from typing import Dict, List, Optional, Any, Union, Tuple, Iterable, cast
99

1010
from .call_wrappers import call, call_throws, CallVerbosity
11-
from .constants import DEFAULT_TIMEOUT
11+
from .constants import (
12+
DEFAULT_TIMEOUT,
13+
# default container images
14+
DEFAULT_ALERT_MANAGER_IMAGE,
15+
DEFAULT_GRAFANA_IMAGE,
16+
DEFAULT_LOKI_IMAGE,
17+
DEFAULT_NODE_EXPORTER_IMAGE,
18+
DEFAULT_PROMETHEUS_IMAGE,
19+
DEFAULT_PROMTAIL_IMAGE,
20+
DEFAULT_HAPROXY_IMAGE,
21+
DEFAULT_KEEPALIVED_IMAGE,
22+
DEFAULT_NVMEOF_IMAGE,
23+
DEFAULT_SNMP_GATEWAY_IMAGE,
24+
DEFAULT_ELASTICSEARCH_IMAGE,
25+
DEFAULT_JAEGER_COLLECTOR_IMAGE,
26+
DEFAULT_JAEGER_AGENT_IMAGE,
27+
DEFAULT_JAEGER_QUERY_IMAGE,
28+
DEFAULT_SMB_IMAGE,
29+
DEFAULT_SMBMETRICS_IMAGE,
30+
DEFAULT_NGINX_IMAGE,
31+
DEFAULT_OAUTH2_PROXY_IMAGE,
32+
)
1233
from .container_engines import Docker, Podman
1334
from .context import CephadmContext
1435
from .daemon_identity import DaemonIdentity, DaemonSubIdentity
@@ -660,3 +681,30 @@ def enable_shared_namespaces(
660681
cc = f'container:{name}'
661682
for n in ns:
662683
_replace_container_arg(args, n.to_option(cc))
684+
685+
686+
def get_mgr_images() -> dict:
687+
"""Return dict of default mgr images"""
688+
mgr_prefix = 'mgr/cephadm/container_image_'
689+
mgr_images = {}
690+
mgr_images[mgr_prefix + 'prometheus'] = DEFAULT_PROMETHEUS_IMAGE
691+
mgr_images[mgr_prefix + 'alertmanager'] = DEFAULT_ALERT_MANAGER_IMAGE
692+
mgr_images[mgr_prefix + 'graphana'] = DEFAULT_GRAFANA_IMAGE
693+
mgr_images[mgr_prefix + 'loki'] = DEFAULT_LOKI_IMAGE
694+
mgr_images[mgr_prefix + 'promtail'] = DEFAULT_PROMTAIL_IMAGE
695+
mgr_images[mgr_prefix + 'node_exporter'] = DEFAULT_NODE_EXPORTER_IMAGE
696+
mgr_images[mgr_prefix + 'haproxy'] = DEFAULT_HAPROXY_IMAGE
697+
mgr_images[mgr_prefix + 'keepalived'] = DEFAULT_KEEPALIVED_IMAGE
698+
mgr_images[mgr_prefix + 'nvmeof'] = DEFAULT_NVMEOF_IMAGE
699+
mgr_images[mgr_prefix + 'snmp_gateway'] = DEFAULT_SNMP_GATEWAY_IMAGE
700+
mgr_images[mgr_prefix + 'elasticsearch'] = DEFAULT_ELASTICSEARCH_IMAGE
701+
mgr_images[
702+
mgr_prefix + 'jaeger_collector'
703+
] = DEFAULT_JAEGER_COLLECTOR_IMAGE
704+
mgr_images[mgr_prefix + 'jaeger_agent'] = DEFAULT_JAEGER_AGENT_IMAGE
705+
mgr_images[mgr_prefix + 'jaeger_query'] = DEFAULT_JAEGER_QUERY_IMAGE
706+
mgr_images[mgr_prefix + 'smb'] = DEFAULT_SMB_IMAGE
707+
mgr_images[mgr_prefix + 'smbmetrics'] = DEFAULT_SMBMETRICS_IMAGE
708+
mgr_images[mgr_prefix + 'nginx'] = DEFAULT_NGINX_IMAGE
709+
mgr_images[mgr_prefix + 'oauth2_proxy'] = DEFAULT_OAUTH2_PROXY_IMAGE
710+
return mgr_images

0 commit comments

Comments
 (0)