cephadm: Modify the structure of the default container images by ShwetaBhosale1 · Pull Request #60412 · ceph/ceph

ShwetaBhosale1 · 2024-10-21T15:08:11Z

cephadm: Modify the structure of the default container images

Fixes: https://tracker.ceph.com/issues/68605

Signed-off-by: Shweta Bhosale Shweta.Bhosale1@ibm.com

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins retest this please
jenkins test classic perf
jenkins test crimson perf
jenkins test signed
jenkins test make check
jenkins test make check arm64
jenkins test submodules
jenkins test dashboard
jenkins test dashboard cephadm
jenkins test api
jenkins test docs
jenkins render docs
jenkins test ceph-volume all
jenkins test ceph-volume tox
jenkins test windows
jenkins test rook e2e

ShwetaBhosale1 · 2024-10-21T15:09:56Z

This PR has cherry-picked commit of PR: #60377.

adk3798 · 2024-10-21T15:35:04Z

I updated the PR title. It's not required to include the tracker being fixed in the PR title and having the component being updated in the title helps identify what's being changed without having to look through the changes.

src/cephadm/cephadmlib/container_types.py

github-actions · 2024-10-30T14:06:48Z

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

ShwetaBhosale1 · 2024-11-04T07:52:42Z

jenkins test api

adk3798

What's here looks pretty good and works. Added a comment about further centralizing the config names on top of the images.

adk3798 · 2024-11-04T18:23:56Z

doc/man/8/cephadm.rst

+list-images
+-----------
+
+List the default container images for all services


We might want to add to this description that we list them in an ini format so the results can be modified and passed to the cluster with the --config flag during bootstrap.

src/pybind/mgr/cephadm/module.py

src/cephadm/cephadmlib/daemons/tracing.py

doc/cephadm/services/monitoring.rst

src/cephadm/cephadmlib/container_types.py

rkachach

The changes LGTM. Very good initiative @ShwetaBhosale1 :)

.. just some comments to improve the code readability/maintenance and to boost the docs automation.

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

rkachach

This is a small detail but I think it's very important to name the field in a descriptive way.

adk3798

Outside of comments Redouane has already provided, this LGTM.

rkachach

LGTM

phlogistonjohn

Looks pretty good to me. I have one small nitpick that you can either follow up on in this PR or in a future one.

One other suggestion is to have the doc changes be a separate commit to the code change. It makes things easier on the reviewer and future explorers of the code.

phlogistonjohn · 2024-11-11T15:12:55Z

src/pybind/mgr/cephadm/module.py

        ),
    ]
+    for image in DefaultImages:
+        MODULE_OPTIONS.append(Option(image.key, default=image.image_ref, desc=image.desc))


phlogistonjohn · 2024-11-11T15:14:40Z

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

+        return self.image_ref
+
+
+def create_image(image_ref: str, key: str) -> ContainerImage:


Tiny nitpick: if this function is not intended to be used outside of this file name it: _create_image. That way you can change it freely without worrying if code has imported and used this function elsewhere.

Updated the PR with function name change.

ShwetaBhosale1 · 2024-11-12T07:28:39Z

jenkins test api

ShwetaBhosale1 · 2024-11-12T07:29:16Z

jenkins test dashboard cephadm

ShwetaBhosale1 · 2024-11-12T08:08:35Z

jenkins test api

ShwetaBhosale1 · 2024-11-12T08:08:55Z

jenkins test dashboard cephadm

ShwetaBhosale1 · 2024-11-12T09:08:07Z

jenkins test api

adk3798 · 2024-11-21T12:49:43Z

https://pulpito.ceph.com/adking-2024-11-19_02:02:13-orch:cephadm-wip-adk-testing-2024-11-18-1758-distro-default-smithi/

Failures:

lots of upgrade failures, primarily because the dashboard cherrypy backports issue fix was still not present in reef when these tests ran
1 MON_DOWN cluster log warning, seen this before, need to update the ignoreslist for this test
1 selinux denial failure in an smb ctdb test, known issue
2 new mgmt-gateway tests being added by a PR in the run failed
1 strange failure applying an SMB spec. Seems like it could be a bug that is just rarely hit in that test, as no SMB related PRs were included in the run

I wouldn't merge any SMB changes or the new tests off of this run, but otherwise it's okay.

github-actions · 2024-11-21T21:49:18Z

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

Fixes: https://tracker.ceph.com/issues/68605?next_issue_id=68599 Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

ShwetaBhosale1 · 2024-11-22T05:04:30Z

Resolved merge conflict of nvmeof.py file

ShwetaBhosale1 · 2024-11-22T06:59:07Z

jenkins test submodules

ShwetaBhosale1 · 2024-11-22T06:59:21Z

jenkins test make check

ShwetaBhosale1 · 2024-11-22T06:59:32Z

jenkins test make check arm64

ShwetaBhosale1 · 2024-11-25T04:48:08Z

jenkins test make check

ShwetaBhosale1 · 2024-11-25T04:48:20Z

jenkins test make check arm64

ShwetaBhosale1 · 2024-11-25T04:49:27Z

jenkins test make check

ShwetaBhosale1 · 2024-11-25T12:55:10Z

jenkins test make check

ShwetaBhosale1 · 2024-11-26T06:30:41Z

jenkins test make check

ShwetaBhosale1 · 2024-11-26T09:23:56Z

jenkins test make check

ShwetaBhosale1 · 2024-11-26T13:38:07Z

jenkins test make check arm64

ShwetaBhosale1 · 2024-11-27T05:27:45Z

jenkins test make check arm64

ShwetaBhosale1 · 2024-11-27T08:33:20Z

jenkins test make check arm64

ShwetaBhosale1 · 2024-11-27T12:57:57Z

jenkins test make check arm64

ShwetaBhosale1 requested review from a team as code owners October 21, 2024 15:08

github-actions bot added cephadm documentation mgr nvmeof pybind labels Oct 21, 2024

adk3798 changed the title ~~Fix issue 68605 modify structure of default images~~ cephadm: Modify the structure of the default container images Oct 21, 2024

adk3798 reviewed Oct 21, 2024

View reviewed changes

src/cephadm/cephadmlib/container_types.py Show resolved Hide resolved

github-actions bot added the needs-rebase label Oct 30, 2024

ShwetaBhosale1 force-pushed the fix_issue_68605_modify_structure_of_default_images branch from 1e9a9c7 to 01b01f8 Compare November 4, 2024 04:08

github-actions bot removed the needs-rebase label Nov 4, 2024

ShwetaBhosale1 requested a review from adk3798 November 4, 2024 14:33

adk3798 reviewed Nov 4, 2024

View reviewed changes

ShwetaBhosale1 force-pushed the fix_issue_68605_modify_structure_of_default_images branch 3 times, most recently from 7da4a4f to d1cb1b7 Compare November 6, 2024 08:29

rkachach reviewed Nov 6, 2024

View reviewed changes

src/cephadm/cephadmlib/daemons/tracing.py Outdated Show resolved Hide resolved

rkachach reviewed Nov 6, 2024

View reviewed changes

doc/cephadm/services/monitoring.rst Outdated Show resolved Hide resolved

rkachach reviewed Nov 6, 2024

View reviewed changes

src/cephadm/cephadmlib/container_types.py Outdated Show resolved Hide resolved

rkachach requested changes Nov 6, 2024

View reviewed changes

rkachach reviewed Nov 6, 2024

View reviewed changes

src/python-common/ceph/cephadm/images.py Outdated Show resolved Hide resolved

rkachach requested changes Nov 6, 2024

View reviewed changes

adk3798 approved these changes Nov 6, 2024

View reviewed changes

adk3798 added the wip-adk-testing label Nov 6, 2024

ShwetaBhosale1 force-pushed the fix_issue_68605_modify_structure_of_default_images branch from d1cb1b7 to 1cb695b Compare November 7, 2024 14:38

adk3798 requested a review from phlogistonjohn November 8, 2024 09:59

rkachach approved these changes Nov 8, 2024

View reviewed changes

phlogistonjohn approved these changes Nov 11, 2024

View reviewed changes

ShwetaBhosale1 force-pushed the fix_issue_68605_modify_structure_of_default_images branch from 26424df to 6b57877 Compare November 12, 2024 04:59

github-actions bot added the needs-rebase label Nov 21, 2024

cephadm: Modify the structure of the default container images

77605ce

Fixes: https://tracker.ceph.com/issues/68605?next_issue_id=68599 Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

ShwetaBhosale1 force-pushed the fix_issue_68605_modify_structure_of_default_images branch from 6b57877 to 77605ce Compare November 22, 2024 05:03

github-actions bot removed the needs-rebase label Nov 22, 2024

adk3798 merged commit eb7c4f5 into ceph:main Dec 2, 2024

		return self.image_ref


		def create_image(image_ref: str, key: str) -> ContainerImage:

Conversation

ShwetaBhosale1 commented Oct 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

ShwetaBhosale1 commented Oct 21, 2024

Uh oh!

adk3798 commented Oct 21, 2024

Uh oh!

Uh oh!

github-actions bot commented Oct 30, 2024

Uh oh!

ShwetaBhosale1 commented Nov 4, 2024

Uh oh!

adk3798 left a comment

Choose a reason for hiding this comment

Uh oh!

adk3798 Nov 4, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rkachach left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rkachach left a comment

Choose a reason for hiding this comment

Uh oh!

adk3798 left a comment

Choose a reason for hiding this comment

Uh oh!

rkachach left a comment

Choose a reason for hiding this comment

Uh oh!

phlogistonjohn left a comment

Choose a reason for hiding this comment

Uh oh!

phlogistonjohn Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

phlogistonjohn Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

ShwetaBhosale1 Nov 12, 2024

Choose a reason for hiding this comment

Uh oh!

ShwetaBhosale1 commented Nov 12, 2024

Uh oh!

ShwetaBhosale1 commented Nov 12, 2024

Uh oh!

ShwetaBhosale1 commented Nov 12, 2024

Uh oh!

ShwetaBhosale1 commented Nov 12, 2024

Uh oh!

ShwetaBhosale1 commented Nov 12, 2024

Uh oh!

adk3798 commented Nov 21, 2024

Uh oh!

github-actions bot commented Nov 21, 2024

Uh oh!

ShwetaBhosale1 commented Nov 22, 2024

Uh oh!

ShwetaBhosale1 commented Nov 22, 2024

Uh oh!

ShwetaBhosale1 commented Nov 22, 2024

Uh oh!

ShwetaBhosale1 commented Nov 22, 2024

Uh oh!

ShwetaBhosale1 commented Nov 25, 2024

Uh oh!

ShwetaBhosale1 commented Nov 25, 2024

Uh oh!

ShwetaBhosale1 commented Nov 25, 2024

Uh oh!

ShwetaBhosale1 commented Nov 25, 2024

Uh oh!

ShwetaBhosale1 commented Nov 26, 2024

ShwetaBhosale1 commented Oct 21, 2024 •

edited

Loading