Add support for Hub RPC API through apache httpd.

Signed-off-by: Ricardo Mateus <rmateus@suse.com>

Author: rjmateus

mgradm/shared/hub/xmlrpcapi.go

@@ -108,7 +108,6 @@ func generateHubXmlrpcSystemdService(systemd podman.Systemd, image string, serve
 	hubXmlrpcData := templates.HubXmlrpcServiceTemplateData{
 		CaSecret:   podman.CASecret,
 		CaPath:     ssl.CAContainerPath,
-		Ports:      utils.HubXmlrpcPorts,
 		NamePrefix: "uyuni",
 		Network:    podman.UyuniNetwork,
 		Image:      image,

mgradm/shared/kubernetes/ports.go

@@ -15,9 +15,6 @@ import (
 func getPortList(hub bool, debug bool) []types.PortMap {
 	ports := utils.GetServerPorts(debug)
 	ports = append(ports, utils.ReportDBPorts...)
-	if hub {
-		ports = append(ports, utils.HubXmlrpcPorts...)
-	}
 
 	return ports
 }

mgradm/shared/templates/hubXmlrpcServiceTemplate.go

@@ -33,9 +33,6 @@ ExecStart=/usr/bin/podman run \
 	--sdnotify=conmon \
 	-d \
 	--replace \
-	{{- range .Ports }}
-        -p {{ .Exposed }}:{{ .Port }}{{if .Protocol}}/{{ .Protocol }}{{end}} \
-    {{- end }}
 	-e HUB_API_URL \
 	-e HUB_CONNECT_TIMEOUT \
 	-e HUB_REQUEST_TIMEOUT \
@@ -61,7 +58,6 @@ WantedBy=multi-user.target default.target
 type HubXmlrpcServiceTemplateData struct {
 	CaSecret   string
 	CaPath     string
-	Ports      []types.PortMap
 	NamePrefix string
 	Image      string
 	Network    string

shared/kubernetes/k3s_test.go

@@ -13,7 +13,6 @@ import (
 // Test that the generated endpoints are valid for traefik.
 func TestGetTraefikEndpointName(t *testing.T) {
 	ports := utils.GetServerPorts(true)
-	ports = append(ports, utils.HubXmlrpcPorts...)
 	ports = append(ports, utils.GetProxyPorts()...)
 
 	for _, port := range ports {

shared/utils/ports.go

@@ -142,11 +142,6 @@ var TCPPodmanPorts = []types.PortMap{
 	NewPortMap("tomcat", "node-exporter", 9100, 9100),
 }
 
-// HubXmlrpcPorts are the tcp ports required by the Hub XMLRPC API service.
-var HubXmlrpcPorts = []types.PortMap{
-	NewPortMap(HubAPIServiceName, "xmlrpc", 2830, 2830),
-}
-
 // ProxyTCPPorts are the tcp ports required by the proxy.
 var ProxyTCPPorts = []types.PortMap{
 	NewPortMap(ProxyTCPServiceName, "ssh", 8022, 22),

uyuni-tools.changes.rmateus.uyuni_hub_xml_rpc_through_apache

@@ -0,0 +1 @@
+- Add support for Hub RPC API through apache httpd.