feat: add separate server image tags ( #673) by mihir-dixit2k27 · Pull Request #706 · uyuni-project/uyuni-tools

mihir-dixit2k27 · 2026-01-19T18:09:55Z

Fixes #673

Problem

The --image and --tag flags apply to all containers equally, making it impossible to pin the server container to a specific image or tag without affecting other containers (coco, pgsql, saline, etc.).

Solution

Introduce two new server-specific flags:

--server-image: overrides the server container image name
--server-tag: overrides the tag for the server container only; falls back to the global --tag if not provided

Changes

mgradm/shared/utils/flags.go: Added ServerImageFlags struct to ServerFlags; viper maps --server-image → server.image and --server-tag → server.tag, following the same pattern as other container flags
mgradm/shared/utils/cmd_utils.go: Added AddServerImageFlags(), called from AddServerFlags() so the flags are available for install, upgrade and migration. Restored deleted comment explaining why some flags have no help group
mgradm/cmd/install/install.go: Wired the override in getFlagsUpdater — if Server.Image or Server.Tag is set, it takes over Image.Name/Image.Tag respectively. Restored deleted comment on the podman alias args handling
shared/podman/utils.go: Removed Name/Tag fields from PodmanFlags where they did not belong
Tests: Added ServerImageOnlyFlagsTestArgs and AssertServerImageFlags covering the full override chain with distinct values, so the test genuinely fails if the wiring is broken. Updated mgradm_install.go and server.go test helpers accordingly

Testing

--server-image and --server-tag appear correctly in mgradm install --help
Override chain verified: --server-image custom/server correctly populates Image.Name, independently of --image
Backward compatibility confirmed: if --server-tag is not provided, the global --tag value is used
Full test suite passes with zero failures

Signed-off-by: Mihir Dixit <dixitmihir1@gmail.com>

Signed-off-by: Mihir Dixit<dixitmihir1@gmail.com>

Signed-off-by : Mihir Dixit <dixitmihir1@gmail.com>

cbosdo

I believe that the new image tags handling is brittle…

Signed-off-by: Mihir Dixit<dixitmihir1@gmail.com>

mihir-dixit2k27 · 2026-01-20T18:49:02Z

@cbosdo Thanks for the guidance! I have addressed all your feedback:

Refactor: I removed the manual flag shuffling in install.go and now rely on the mapstructure tags as you suggested.

Cleanup: I removed the verbose comments in cmd_utils.go and install.go.

Conflicts: I have resolved the conflicts with the recent refactor in main.

Regarding Squashing: Since I am working through the Web UI to ensure valid GPG signatures (due to local environment restrictions), I cannot easily squash these commits locally without breaking the signatures. Could you please use the "Squash and Merge" option when merging this PR?

Ready for final review!

sonarqubecloud · 2026-01-22T18:26:04Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sonarqubecloud · 2026-02-26T06:59:32Z

Quality Gate failed

Failed conditions
1 New issue
32.4% Duplication on New Code (required ≤ 20%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

cbosdo

This PR changes a crucial part of the logic (the image URLs computation) and there is no unit test added or adjusted. This looks really strange.

cbosdo · 2026-03-30T14:59:49Z

+			}
+
 			// If the alias "install podman" is used, "podman" will be the first arg.
-			// We remove it from the args slice so it isn't treated as the FQDN.


Why are you removing this valuable comment? I wonder how much of this PR has been generated by an AI…

cbosdo · 2026-03-30T15:02:01Z

-	_ = utils.AddFlagHelpGroup(cmd, &utils.Group{ID: "image", Title: L("Image Flags")})
-	_ = utils.AddFlagToHelpGroupID(cmd, "image", "image")
-	_ = utils.AddFlagToHelpGroupID(cmd, "tag", "image")
-	// without group, since this flag is applied to all the images


Why removing that comment: it explains why there is no group on those flags…

cbosdo · 2026-03-30T15:04:55Z

+	Name string `mapstructure:"server-image"`
+	Tag  string `mapstructure:"server-tag"`


These flags should go in the ServerFlags rather than this podman-specific struct. Someday we may remove this relic from a not so far future, but avoid mixing them for now.

mihir-dixit2k27 · 2026-03-30T17:03:49Z

@cbosdo Acknowledged — I'm working through all the review feedback carefully. Will push the fixes once everything is properly addressed.

Add --server-image and --server-tag flags so users can pin the server container image independently of the global --image and --tag flags, which apply to all containers (coco, pgsql, saline, etc.). - Add ServerImageFlags struct and Server field to ServerFlags; viper maps --server-image to server.image and --server-tag to server.tag - Add AddServerImageFlags() in cmd_utils.go, called from AddServerFlags() - Wire the override in getFlagsUpdater (install) and the inline updater (upgrade): Server.Image -> Image.Name, Server.Tag -> Image.Tag - Move Name/Tag out of PodmanFlags; they belong in ServerFlags - Restore deleted comment and help group lines in cmd_utils.go - Restore deleted comment in install.go RunE - Add AssertServerImageFlags test helper and ServerImageOnlyFlagsTestArgs with distinct values to verify the override chain actually runs Signed-off-by: Mihir Dixit <dixitmihir1@gmail.com>

sonarqubecloud · 2026-04-10T15:16:54Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

mihir-dixit2k27 added 4 commits January 19, 2026 23:34

feat: add server-image and server-tag flags

b60bb56

Signed-off-by: Mihir Dixit <dixitmihir1@gmail.com>

Add Name and Tag fields to PodmanFlags struct

4f72419

Signed-off-by: Mihir Dixit <dixitmihir1@gmail.com>

feat: implement podman check and tag logic

57f5cc9

Signed-off-by: Mihir Dixit<dixitmihir1@gmail.com>

refactor: reduce cognitive complexity in install command

dc7a8e6

Signed-off-by : Mihir Dixit <dixitmihir1@gmail.com>

cbosdo requested changes Jan 20, 2026

View reviewed changes

mihir-dixit2k27 added 2 commits January 21, 2026 00:10

Merge branch 'main' into feat/server-tags-refactor

4a62ee5

style: remove verbose comments

236d404

Signed-off-by: Mihir Dixit<dixitmihir1@gmail.com>

Merge branch 'main' into feat/server-tags-refactor

dd0ebf7

mihir-dixit2k27 requested a review from cbosdo January 21, 2026 17:29

Merge branch 'main' into feat/server-tags-refactor

6aebb4e

Merge branch 'main' into feat/server-tags-refactor

3c4298c

cbosdo requested changes Mar 30, 2026

View reviewed changes

mihir-dixit2k27 and others added 2 commits April 10, 2026 15:12

Merge branch 'main' into feat/server-tags-refactor

f94b29c

mihir-dixit2k27 changed the title ~~feat: add podman binary check and separate server image tags (Fixes #621, #673)~~ feat: add separate server image tags ( #673) Apr 10, 2026

mihir-dixit2k27 requested a review from cbosdo April 10, 2026 16:53

		Name string `mapstructure:"server-image"`
		Tag string `mapstructure:"server-tag"`

Uh oh!

Conversation

mihir-dixit2k27 commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Changes

Testing

Uh oh!

cbosdo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mihir-dixit2k27 commented Jan 20, 2026

Uh oh!

sonarqubecloud Bot commented Jan 22, 2026

Quality Gate passed

Uh oh!

sonarqubecloud Bot commented Feb 26, 2026

Quality Gate failed

Uh oh!

cbosdo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cbosdo Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

cbosdo Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

cbosdo Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

mihir-dixit2k27 commented Mar 30, 2026

Uh oh!

sonarqubecloud Bot commented Apr 10, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mihir-dixit2k27 commented Jan 19, 2026 •

edited

Loading