From f4252564eabdd45d4165e2b7a70fff682ff4f385 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Mon, 6 Apr 2026 15:47:23 +0530 Subject: [PATCH] cephadm/images: Update tags for samba and smbmetrics containers It has been a few months since the samba-container and smbmetrics projects started tagging image names with child manifests corresponding to system architecture. This commit updates the default images for the samba-server and samba-metrics containers to use those new architecture independent tags. Signed-off-by: Anoop C S --- src/pybind/mgr/cephadm/tests/services/test_smb.py | 2 +- src/python-common/ceph/cephadm/images.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/services/test_smb.py b/src/pybind/mgr/cephadm/tests/services/test_smb.py index e55be55f543..4acde77a0db 100644 --- a/src/pybind/mgr/cephadm/tests/services/test_smb.py +++ b/src/pybind/mgr/cephadm/tests/services/test_smb.py @@ -6,7 +6,7 @@ from cephadm.module import CephadmOrchestrator from cephadm.tests.fixtures import with_host, with_service, async_side_effect -_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64' +_SAMBA_METRICS_IMAGE = 'quay.io/samba.org/samba-metrics:devbuilds-centos-any' class TestSMB: diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py index 747768d73e9..afe5c4a37b4 100644 --- a/src/python-common/ceph/cephadm/images.py +++ b/src/python-common/ceph/cephadm/images.py @@ -56,10 +56,10 @@ class DefaultImages(Enum): 'quay.io/jaegertracing/jaeger-query:1.29', 'jaeger_query' ) SAMBA = _create_image( - 'quay.io/samba.org/samba-server:devbuilds-centos-amd64', 'samba' + 'quay.io/samba.org/samba-server:devbuilds-centos-any', 'samba' ) SAMBA_METRICS = _create_image( - 'quay.io/samba.org/samba-metrics:devbuilds-centos-amd64', + 'quay.io/samba.org/samba-metrics:devbuilds-centos-any', 'samba_metrics', ) NGINX = _create_image('quay.io/ceph/nginx:sclorg-nginx-126', 'nginx') -- 2.47.3