Recreate credentials if they are missing on install

To avoid reusing old passwords, we need to force recreating user
secrets if they are already present.

Uninstall also did not remove those secrets, fixed.

This commit also adjust heatlhcheck timeout to 5 minutes as the
server container can now take a while until it is ready.

Author: aaannz

mgradm/cmd/uninstall/podman.go

@@ -90,6 +90,8 @@ func uninstallForPodman(
 	podman.DeleteSecret(podman.CASecret, !flags.Force)
 	podman.DeleteSecret(podman.SSLCertSecret, !flags.Force)
 	podman.DeleteSecret(podman.SSLKeySecret, !flags.Force)
+	podman.DeleteSecret(podman.AdminUserSecret, !flags.Force)
+	podman.DeleteSecret(podman.AdminPassSecret, !flags.Force)
 
 	err := systemd.ReloadDaemon(!flags.Force)
 

mgradm/shared/podman/podman.go

@@ -155,14 +155,14 @@ func GenerateSystemdService(
 	}
 
 	// Add the SCC and admin credentials as secrets
-	if err := podman.CreateCredentialsSecretsIfMissing(
+	if err := podman.CreateCredentialsSecrets(
 		podman.AdminUserSecret, flags.Admin.Login, podman.AdminPassSecret, flags.Admin.Password,
 	); err != nil {
 		return err
 	}
 
 	if flags.SCC.User != "" {
-		if err := podman.CreateCredentialsSecretsIfMissing(
+		if err := podman.CreateCredentialsSecrets(
 			podman.SCCUserSecret, flags.SCC.User, podman.SCCPassSecret, flags.SCC.Password,
 		); err != nil {
 			return err

shared/connection.go

@@ -363,8 +363,9 @@ func (c *Connection) WaitForContainer() error {
 
 // WaitForHealthcheck waits at most 120s for healtcheck to succeed.
 func (c *Connection) WaitForHealthcheck() error {
+	const maxWaitTime = 300
 	// Wait for the system to be up
-	for i := 0; i < 120; i++ {
+	for i := 0; i < maxWaitTime; i++ {
 		_, err := c.Healthcheck()
 		if err != nil {
 			log.Debug().Err(err)
@@ -373,7 +374,7 @@ func (c *Connection) WaitForHealthcheck() error {
 		}
 		return nil
 	}
-	return errors.New(L("container didn't start within 120s. Check for the service status"))
+	return fmt.Errorf(L("container didn't start within %ds. Check for the service status"), maxWaitTime)
 }
 
 // Copy transfers a file to or from the container.