do not call uyuni-postgres-config.sh in mgradm (bsc#12099)

Author: mbussolotto

mgradm/shared/podman/podman.go

@@ -444,7 +444,8 @@ func Upgrade(
 	}
 
 	if inspectedValues.DBHost == "localhost" ||
-		inspectedValues.ReportDBHost == "localhost" {
+		inspectedValues.ReportDBHost == "localhost" ||
+		!podman.HasSecret(podman.DBSSLCertSecret) {
 		log.Info().Msgf(L("Configuring split PostgreSQL container"))
 
 		if err := PrepareSSLCertificates(preparedServerImage, &ssl, tz, fqdn); err != nil {
@@ -585,22 +586,6 @@ func RunSplitContainerSettings(serverImage string, dbHost string, reportDBHost s
 		[]string{"bash", "-e", "-c", scriptBuilder.String()})
 }
 
-// RunConfigPgsl setup postgres container.
-func RunConfigPgsl(pgsqlImage string) error {
-	podmanArgs := []string{
-		"--security-opt", "label=disable",
-		"--secret", fmt.Sprintf("%s,type=mount,target=%s", podman.DBCASecret, ssl.DBCAContainerPath),
-		"--secret", fmt.Sprintf("%s,type=mount,uid=999,mode=0400,target=%s", podman.DBSSLKeySecret, ssl.DBCertKeyPath),
-		"--secret", fmt.Sprintf("%s,type=mount,target=%s", podman.DBSSLCertSecret, ssl.DBCertPath),
-		"--entrypoint", "/docker-entrypoint-initdb.d/uyuni-postgres-config.sh",
-	}
-	if err := podman.RunContainer("uyuni-db-config", pgsqlImage, utils.PgsqlRequiredVolumeMounts,
-		podmanArgs, []string{}); err != nil {
-		return err
-	}
-	return systemd.RestartService(podman.DBService)
-}
-
 // CallCloudGuestRegistryAuth calls cloudguestregistryauth if it is available.
 func CallCloudGuestRegistryAuth() error {
 	cloudguestregistryauth := "cloudguestregistryauth"
@@ -729,5 +714,5 @@ func configureDBContainer(
 			db.Host,
 		)
 	}
-	return RunConfigPgsl(pgsqlImage)
+	return nil
 }

uyuni-tools.changes.mbussolotto.single_pg_hba_conf

@@ -0,0 +1 @@
+- Do not call uyuni-postgres-config.sh in mgradm (bsc#12099).