RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42031 from sebastian-philipp/normalize_image_digest_local-registry

Browse Source 
cephadm: Fix normalize_image_digest for local registries

Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Kefu Chai 2021-06-29 16:20:28 +08:00 committed by GitHub
commit 135b6dde5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cephadm/cephadm
View File

@ -3371,7 +3371,7 @@ def normalize_image_digest(digest):
# quay.ceph.io/ceph/ceph -> ceph
# docker.io/ubuntu -> no change
bits = digest.split('/')
if '.' not in bits[0] or len(bits) < 3:
if '.' not in bits[0] and len(bits) < 3:
digest = DEFAULT_REGISTRY + '/' + digest
return digest

6
src/cephadm/tests/test_cephadm.py
View File

@ -535,6 +535,12 @@ docker.io/ceph/daemon-base:octopus
ctx.container_engine = mock_docker()
assert not cd.should_log_to_journald(ctx)
def test_normalize_image_digest(self):
s = 'myhostname:5000/ceph/ceph@sha256:753886ad9049004395ae990fbb9b096923b5a518b819283141ee8716ddf55ad1'
assert cd.normalize_image_digest(s) == s
s = 'ceph/ceph:latest'
assert cd.normalize_image_digest(s) == f'{cd.DEFAULT_REGISTRY}/{s}'
class TestCustomContainer(unittest.TestCase):
cc: cd.CustomContainer