Attach proxy pod to our podman network

mgrpxy/shared/podman/podman.go

@@ -36,9 +36,10 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Ports:         ports,
 		HttpProxyFile: httpProxyConfig,
 		Args:          strings.Join(podmanArgs, " "),
+		Network:       podman.UyuniNetwork,
 	}
 	if err := generateSystemdFile(dataPod, "pod"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return err
 	}
 
 	// Httpd
@@ -48,7 +49,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Image:         httpdImage,
 	}
 	if err := generateSystemdFile(dataHttpd, "httpd"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return fmt.Errorf("cannot generate systemd file: %s", err)
 	}
 
 	// Salt broker
@@ -57,7 +58,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Image:         saltBrokerImage,
 	}
 	if err := generateSystemdFile(dataSaltBroker, "salt-broker"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return err
 	}
 
 	// Squid
@@ -67,7 +68,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Image:         squidImage,
 	}
 	if err := generateSystemdFile(dataSquid, "squid"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return err
 	}
 
 	// SSH
@@ -76,7 +77,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Image:         sshImage,
 	}
 	if err := generateSystemdFile(dataSSH, "ssh"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return err
 	}
 
 	// Tftpd
@@ -86,7 +87,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Image:         tftpdImage,
 	}
 	if err := generateSystemdFile(dataTftpd, "tftpd"); err != nil {
-		return fmt.Errorf("cannot generated systemd file: %s", err)
+		return err
 	}
 
 	return podman.ReloadDaemon(false)
@@ -98,7 +99,7 @@ func generateSystemdFile(template utils.Template, service string) error {
 	const systemdPath = "/etc/systemd/system"
 	path := path.Join(systemdPath, name)
 	if err := utils.WriteTemplateToFile(template, path, 0644, true); err != nil {
-		return fmt.Errorf("failed to generate %s", path)
+		return fmt.Errorf("failed to generate '%s', error '%s'", path, err)
 	}
 	return nil
 }

mgrpxy/shared/templates/pod.go

@@ -30,6 +30,7 @@ ExecStartPre=/bin/rm -f %t/uyuni-proxy-pod.pid %t/uyuni-proxy-pod.pod-id
 
 ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/uyuni-proxy-pod.pid \
 		--pod-id-file %t/uyuni-proxy-pod.pod-id --name uyuni-proxy-pod \
+		--network {{ .Network }} \
         {{- range .Ports }}
         -p {{ .Exposed }}:{{ .Port }}{{ if .Protocol }}/{{ .Protocol }}{{ end }} \
         {{- end }}
@@ -52,6 +53,7 @@ type PodTemplateData struct {
 	Ports         []types.PortMap
 	HttpProxyFile string
 	Args          string
+	Network       string
 }
 
 // Render will create the systemd configuration file.

shared/utils/template.go

@@ -5,10 +5,9 @@
 package utils
 
 import (
+	"fmt"
 	"io"
 	"os"
-
-	"github.com/rs/zerolog/log"
 )
 
 // Template is an interface for implementing Render function.
@@ -21,14 +20,14 @@ func WriteTemplateToFile(template Template, path string, perm os.FileMode, overw
 	// Check if the file is existing
 	if !overwrite {
 		if FileExists(path) {
-			log.Fatal().Msgf("%s file already present, not overwriting", path)
+			return fmt.Errorf("file '%s' already present, not overwriting", path)
 		}
 	}
 
 	// Write the configuration
 	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
 	if err != nil {
-		log.Fatal().Err(err).Msgf("Failed to open %s for writing", path)
+		return fmt.Errorf("failed to open '%s' for writing: %s", path, err)
 	}
 	defer file.Close()
 

uyuni-tools.changes.oholecek.setup_proxy_pod_correct_net

@@ -0,0 +1 @@
+- Attach proxy pod to our podman network