Merge pull request #759 from aaannz/setup-merge

Merge the setup with the server container start

Author: mcalmer

.github/workflows/checks.yml

@@ -36,5 +36,5 @@ jobs:
         shell: sh -x {0}
         run: |
           git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
+          CHANGED_FILES=$(git diff --name-status origin/${{ github.base_ref }}...HEAD | grep -v "^D" | cut -f 2)
           ./update-copyright-year.sh $CHANGED_FILES

mgradm/cmd/backup/restore/systemd_utils.go

@@ -15,6 +15,7 @@ import (
 	"github.com/uyuni-project/uyuni-tools/mgradm/cmd/backup/shared"
 	"github.com/uyuni-project/uyuni-tools/mgradm/shared/pgsql"
 	"github.com/uyuni-project/uyuni-tools/mgradm/shared/podman"
+	adm_utils "github.com/uyuni-project/uyuni-tools/mgradm/shared/utils"
 	. "github.com/uyuni-project/uyuni-tools/shared/l10n"
 	"github.com/uyuni-project/uyuni-tools/shared/utils"
 )
@@ -108,8 +109,12 @@ func generateDefaultSystemdServices(flags *shared.Flagpole) error {
 		utils.PostgreSQLImage.Name,
 		utils.PostgreSQLImage.Tag)
 
+	// Assumption is system is already configured when backup was taken.
+	// No need for server environment file and everything should just work.
+
 	return utils.JoinErrors(
-		podman.GenerateSystemdService(systemd, "", serverImage, false, "", []string{}),
+		podman.GenerateUpgradeServerEnvironmentFile(false),
+		podman.GenerateSystemdService(systemd, serverImage, adm_utils.InstallationFlags{}, []string{}, ""),
 		pgsql.GeneratePgsqlSystemdService(systemd, dbImage),
 		systemd.ReloadDaemon(false),
 	)

mgradm/cmd/install/flags.go

@@ -20,8 +20,6 @@ func AddInstallFlags(cmd *cobra.Command) {
 
 	cmd_utils.AddServerFlags(cmd)
 
-	cmd.Flags().Bool("debug-java", false, L("Enable tomcat and taskomatic remote debugging"))
-
 	cmd_utils.AddCocoFlag(cmd)
 
 	cmd_utils.AddHubXmlrpcFlags(cmd)

mgradm/cmd/install/install.go

@@ -51,8 +51,8 @@ NOTE: installing on a remote podman is not supported yet!
 
 	adm_utils.AddMirrorFlag(cmd)
 	AddInstallFlags(cmd)
+	adm_utils.AddDebugFlags(cmd)
 	podman.AddPodmanArgFlag(cmd)
-
 	return cmd
 }
 

mgradm/cmd/install/utils.go

@@ -6,7 +6,6 @@ package install
 
 import (
 	"errors"
-	"fmt"
 	"os/exec"
 
 	"github.com/rs/zerolog"
@@ -19,11 +18,9 @@ import (
 	"github.com/uyuni-project/uyuni-tools/mgradm/shared/podman"
 	"github.com/uyuni-project/uyuni-tools/mgradm/shared/saline"
 	"github.com/uyuni-project/uyuni-tools/mgradm/shared/tftp"
-	adm_utils "github.com/uyuni-project/uyuni-tools/mgradm/shared/utils"
 	"github.com/uyuni-project/uyuni-tools/shared"
 	. "github.com/uyuni-project/uyuni-tools/shared/l10n"
 	shared_podman "github.com/uyuni-project/uyuni-tools/shared/podman"
-	"github.com/uyuni-project/uyuni-tools/shared/ssl"
 	"github.com/uyuni-project/uyuni-tools/shared/types"
 	"github.com/uyuni-project/uyuni-tools/shared/utils"
 )
@@ -82,15 +79,19 @@ func installForPodman(
 		return err
 	}
 
-	log.Info().Msg(L("Run setup command"))
-
-	if err := runSetup(preparedImage, &flags.ServerFlags, fqdn); err != nil {
+	// This creates installation values to be passed as envvars
+	if err := podman.GenerateServerEnvironmentFile(flags.Installation, fqdn, flags.Mirror != ""); err != nil {
 		return err
 	}
 
+	if err := podman.GenerateSystemdService(
+		systemd, preparedImage, flags.Installation, flags.Podman.Args, flags.Mirror,
+	); err != nil {
+		return utils.Error(err, L("failed to generate server service"))
+	}
+
 	cnx := shared.NewConnection("podman", shared_podman.ServerContainerName, "")
-	if err := podman.WaitForSystemStart(systemd, cnx, preparedImage, flags.Installation.TZ,
-		flags.Installation.Debug.Java, flags.Mirror, flags.Podman.Args); err != nil {
+	if err := podman.WaitForSystemStart(systemd, cnx); err != nil {
 		return utils.Error(err, L("cannot wait for system start"))
 	}
 	if err := cnx.CopyCaCertificate(fqdn); err != nil {
@@ -114,7 +115,7 @@ func installForPodman(
 	)
 }
 
-func setupDatabase(dbFlags adm_utils.DBFlags, reportdbFlags adm_utils.DBFlags, preparedImage string) error {
+func setupDatabase(dbFlags types.DBFlags, reportdbFlags types.DBFlags, preparedImage string) error {
 	if err := shared_podman.CreateCredentialsSecrets(
 		shared_podman.DBUserSecret, dbFlags.User,
 		shared_podman.DBPassSecret, dbFlags.Password,
@@ -129,81 +130,29 @@ func setupDatabase(dbFlags adm_utils.DBFlags, reportdbFlags adm_utils.DBFlags, p
 		return err
 	}
 
-	if dbFlags.IsLocal() {
-		// The admin password is not needed for external databases
-		if err := shared_podman.CreateCredentialsSecrets(
-			shared_podman.DBAdminUserSecret, dbFlags.Admin.User,
-			shared_podman.DBAdminPassSecret, dbFlags.Admin.Password,
-		); err != nil {
-			return err
-		}
-		if dbFlags.Walbackup {
-			if err := pgsql.GenerateBackupVolumeConfig(systemd); err != nil {
-				return err
-			}
-		}
-		// Run the DB container setup if the user doesn't set a custom host name for it.
-		if err := pgsql.SetupPgsql(systemd, preparedImage); err != nil {
-			return err
-		}
-		if dbFlags.Walbackup {
-			if err := db.Enable(true); err != nil {
-				return err
-			}
-		}
-	} else {
+	if !dbFlags.IsLocal() {
 		log.Info().Msgf(
 			L("Skipped database container setup to use external database %s"),
 			dbFlags.Host,
 		)
+		return nil
 	}
-	return nil
-}
 
-// runSetup execute the setup.
-func runSetup(image string, flags *adm_utils.ServerFlags, fqdn string) error {
-	env := adm_utils.GetSetupEnv(flags.Mirror, &flags.Installation, fqdn)
-	envNames := []string{}
-	envValues := []string{}
-	for key, value := range env {
-		envNames = append(envNames, "-e", key)
-		envValues = append(envValues, fmt.Sprintf("%s=%s", key, value))
-	}
-
-	command := []string{
-		"run",
-		"--rm",
-		"--shm-size=0",
-		"--shm-size-systemd=0",
-		"--name", "uyuni-setup",
-		"--network", shared_podman.UyuniNetwork,
-		"-e", "TZ=" + flags.Installation.TZ,
-		"--secret", shared_podman.DBUserSecret + ",type=env,target=MANAGER_USER",
-		"--secret", shared_podman.DBPassSecret + ",type=env,target=MANAGER_PASS",
-		"--secret", shared_podman.ReportDBUserSecret + ",type=env,target=REPORT_DB_USER",
-		"--secret", shared_podman.ReportDBPassSecret + ",type=env,target=REPORT_DB_PASS",
-		"-e REPORT_DB_CA_CERT=" + ssl.DBCAContainerPath,
-		"--secret", shared_podman.DBCASecret + ",type=mount,target=" + ssl.DBCAContainerPath,
-		"--secret", shared_podman.CASecret + ",type=mount,target=" + ssl.CAContainerPath,
-		"--secret", shared_podman.CASecret + ",type=mount,target=/usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT",
-		"--secret", shared_podman.CASecret + ",type=mount,target=/srv/www/htdocs/pub/RHN-ORG-TRUSTED-SSL-CERT",
-		"--secret", shared_podman.SSLCertSecret + ",type=mount,target=" + ssl.ServerCertPath,
-		"--secret", shared_podman.SSLKeySecret + ",type=mount,target=" + ssl.ServerCertKeyPath,
-	}
-	for _, volume := range utils.ServerVolumeMounts {
-		command = append(command, "-v", fmt.Sprintf("%s:%s", volume.Name, volume.MountPath))
-	}
-	command = append(command, envNames...)
-	command = append(command, image)
-
-	command = append(command, "/usr/bin/bash", "-e", "-c", "/docker-entrypoint-init.d/00-mgrSetup.sh")
-
-	if _, err := newRunner("podman", command...).Env(envValues).StdMapping().Exec(); err != nil {
-		return utils.Error(err, L("server setup failed"))
-	}
-
-	log.Info().Msgf(L("Server set up, login on https://%[1]s with %[2]s user"), fqdn, flags.Installation.Admin.Login)
+	// The admin password is not needed for external databases
+	if err := shared_podman.CreateCredentialsSecrets(
+		shared_podman.DBAdminUserSecret, dbFlags.Admin.User,
+		shared_podman.DBAdminPassSecret, dbFlags.Admin.Password,
+	); err != nil {
+		return err
+	}
+	// Run the DB container setup if the user doesn't set a custom host name for it.
+	if err := pgsql.SetupPgsql(systemd, preparedImage); err != nil {
+		return err
+	}
+	if dbFlags.Walbackup {
+		if err := db.Enable(true); err != nil {
+			return err
+		}
+	}
 	return nil
 }
-
-var newRunner = utils.NewRunner

mgradm/cmd/support/ptf/utils.go

@@ -41,8 +41,8 @@ func ptfForPodman(
 	//we don't want to perform a postgres version upgrade when installing a PTF.
 	//in that case, we can use the upgrade command.
 	dummyImage := types.ImageFlags{}
-	dummyDB := adm_utils.DBFlags{}
-	dummyReportDB := adm_utils.DBFlags{}
+	dummyDB := types.DBFlags{}
+	dummyReportDB := types.DBFlags{}
 	dummySSL := adm_utils.InstallSSLFlags{}
 
 	if err := flags.checkParameters(authFile); err != nil {
@@ -61,6 +61,7 @@ func ptfForPodman(
 		flags.Pgsql,
 		flags.TFTPD,
 		flags.Installation.TZ,
+		flags.Installation.Debug.Java,
 	)
 }
 

mgradm/cmd/upgrade/upgrade.go

@@ -42,6 +42,7 @@ func newCmd(globalFlags *types.GlobalFlags, run utils.CommandFunc[podmanUpgradeF
 		},
 	}
 	AddUpgradeFlags(cmd)
+	cmd_utils.AddDebugFlags(cmd)
 	podman.AddPodmanArgFlag(cmd)
 	return cmd
 }

mgradm/cmd/upgrade/utils.go

@@ -47,5 +47,6 @@ func upgradePodman(_ *types.GlobalFlags, flags *podmanUpgradeFlags, cmd *cobra.C
 		flags.Pgsql,
 		flags.TFTPD,
 		flags.Installation.TZ,
+		flags.Installation.Debug.Java,
 	)
 }

mgradm/shared/coco/coco.go

@@ -22,7 +22,7 @@ func Upgrade(
 	authFile string,
 	cocoFlags adm_utils.CocoFlags,
 	baseImage types.ImageFlags,
-	db adm_utils.DBFlags,
+	db types.DBFlags,
 ) error {
 	if cocoFlags.Image.Name == "" {
 		log.Info().Msg(L("Not altering the confidential computing service"))
@@ -54,7 +54,7 @@ func writeCocoServiceFiles(
 	authFile string,
 	cocoFlags adm_utils.CocoFlags,
 	baseImage types.ImageFlags,
-	db adm_utils.DBFlags,
+	db types.DBFlags,
 ) error {
 	image := cocoFlags.Image
 	currentReplicas := systemd.CurrentReplicaCount(podman.ServerAttestationService)
@@ -104,7 +104,7 @@ Environment=database_connection=jdbc:postgresql://%s:%d/%s
 `, preparedImage, db.Host, db.Port, db.Name)
 
 	if err := podman.GenerateSystemdConfFile(
-		podman.ServerAttestationService+"@", "generated.conf", environment, true,
+		podman.ServerAttestationService+"@", podman.GeneratedConf, environment, true,
 	); err != nil {
 		return utils.Errorf(err, L("cannot generate systemd conf file"))
 	}
@@ -121,7 +121,7 @@ func SetupCocoContainer(
 	authFile string,
 	coco adm_utils.CocoFlags,
 	baseImage types.ImageFlags,
-	db adm_utils.DBFlags,
+	db types.DBFlags,
 ) error {
 	if err := writeCocoServiceFiles(
 		systemd, authFile, coco, baseImage, db,

mgradm/shared/hub/xmlrpcapi.go

@@ -117,7 +117,7 @@ func generateHubXmlrpcSystemdService(systemd podman.Systemd, image string, serve
 
 	environment := fmt.Sprintf("Environment=UYUNI_HUB_XMLRPC_IMAGE=%s", image)
 	if err := podman.GenerateSystemdConfFile(
-		podman.HubXmlrpcService+"@", "generated.conf", environment, true,
+		podman.HubXmlrpcService+"@", podman.GeneratedConf, environment, true,
 	); err != nil {
 		return utils.Errorf(err, L("cannot generate systemd conf file"))
 	}