Merge pull request #771 from aaannz/fix_missing_secrets_on_upgrade

Generate template only after secrets are created

Author: mcalmer

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

@@ -154,32 +154,32 @@ func GenerateSystemdService(
 		return utils.Errorf(err, L("cannot setup network"))
 	}
 
-	log.Info().Msg(L("Enabling system service"))
-	if err := GenerateServerSystemdService(mirrorPath, flags.Debug.Java); err != nil {
-		return err
-	}
-
-	if err := podman.GenerateSystemdConfFile(podman.ServerService, podman.GeneratedConf,
-		"Environment=UYUNI_IMAGE="+image, true,
-	); err != nil {
-		return utils.Errorf(err, L("cannot generate systemd conf file"))
-	}
-
 	// 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
 		}
 	}
 
+	log.Info().Msg(L("Enabling system service"))
+	if err := GenerateServerSystemdService(mirrorPath, flags.Debug.Java); err != nil {
+		return err
+	}
+
+	if err := podman.GenerateSystemdConfFile(podman.ServerService, podman.GeneratedConf,
+		"Environment=UYUNI_IMAGE="+image, true,
+	); err != nil {
+		return utils.Errorf(err, L("cannot generate systemd conf file"))
+	}
+
 	config := fmt.Sprintf("Environment=\"PODMAN_EXTRA_ARGS=%s\"", strings.Join(podmanArgs, " "))
 	if !utils.FileExists(podman.GetServiceConfPath(podman.ServerService, podman.CustomConf)) {
 		if err := podman.GenerateSystemdConfFile(podman.ServerService, podman.CustomConf, config, false); err != nil {

shared/connection.go

@@ -361,10 +361,12 @@ func (c *Connection) WaitForContainer() error {
 	return errors.New(L("container didn't start within 10s."))
 }
 
-// WaitForHealthcheck waits at most 120s for healtcheck to succeed.
+// WaitForHealthcheck waits at most 180s for healtcheck to succeed.
 func (c *Connection) WaitForHealthcheck() error {
+	// On update consider healtcheck configuration in the container Dockerfile
+	const maxWaitTime = 180
 	// 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 +375,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.

uyuni-tools.changes.oholecek.fix_generating_secrets

@@ -0,0 +1 @@
+- Generate service template only after secrets are created