Merge pull request #503 from cbosdo/2024-10-ports-preparation

Reverts to allow forward porting from 2024.10

mgradm/cmd/install/podman/podman.go

@@ -6,7 +6,6 @@ package podman
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/uyuni-project/uyuni-tools/mgradm/cmd/install/shared"
 	. "github.com/uyuni-project/uyuni-tools/shared/l10n"
 	"github.com/uyuni-project/uyuni-tools/shared/podman"
@@ -32,11 +31,7 @@ NOTE: installing on a remote podman is not supported yet!
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var flags podmanInstallFlags
-			flagsUpdater := func(v *viper.Viper) {
-				flags.InstallFlags.Coco.IsChanged = v.IsSet("coco.replicas")
-				flags.InstallFlags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
-			}
-			return utils.CommandHelper(globalFlags, cmd, args, &flags, flagsUpdater, run)
+			return utils.CommandHelper(globalFlags, cmd, args, &flags, installForPodman)
 		},
 	}
 

mgradm/cmd/install/podman/utils.go

@@ -129,8 +129,8 @@ func installForPodman(
 
 	if flags.Coco.Replicas > 0 {
 		if err := coco.SetupCocoContainer(
-			systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
-			flags.DB.Name, flags.DB.Port, flags.DB.User, flags.DB.Password,
+			authFile, flags.Image.Registry, flags.Coco, flags.Image,
+			flags.Db.Name, flags.Db.Port, flags.Db.User, flags.Db.Password,
 		); err != nil {
 			return err
 		}

mgradm/cmd/uninstall/podman.go

@@ -69,12 +69,10 @@ func uninstallForPodman(
 
 	podman.DeleteNetwork(!flags.Force)
 
-	err := systemd.ReloadDaemon(!flags.Force)
+	err := podman.ReloadDaemon(!flags.Force)
 
 	if !flags.Force {
-		log.Warn().Msg(
-			L("Nothing has been uninstalled, run with --force and --purge-volumes to actually uninstall and clear data"),
-		)
+		log.Warn().Msg(L("Nothing has been uninstalled, run with --force and --purge-volumes to actually uninstall and clear data"))
 	} else if !flags.Purge.Volumes {
 		log.Warn().Msg(L("Data have been kept, use podman volume commands to clear the volumes"))
 	}

mgradm/shared/coco/coco.go

@@ -28,13 +28,8 @@ func Upgrade(
 	dbUser string,
 	dbPassword string,
 ) error {
-	if cocoFlags.Image.Name == "" {
-		// Don't touch the coco service in ptf if not already present.
-		return nil
-	}
-
 	if err := writeCocoServiceFiles(
-		systemd, authFile, registry, cocoFlags, baseImage, dbName, dbPort, dbUser, dbPassword,
+		authFile, registry, cocoFlags, baseImage, dbName, dbPort, dbUser, dbPassword,
 	); err != nil {
 		return err
 	}
@@ -128,7 +123,7 @@ func SetupCocoContainer(
 	dbPassword string,
 ) error {
 	if err := writeCocoServiceFiles(
-		systemd, authFile, registry, coco, baseImage, dbName, dbPort, dbUser, dbPassword,
+		authFile, registry, coco, baseImage, dbName, dbPort, dbUser, dbPassword,
 	); err != nil {
 		return err
 	}