e2e: add RuntimeArgs to container infra provider API

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

test/e2e/e2e.go

@@ -712,7 +712,7 @@ var _ = ginkgo.Describe("e2e control plane", func() {
 		}
 		secondaryExternalContainerPort := infraprovider.Get().GetExternalContainerPort()
 		secondaryExternalContainerSpec := infraapi.ExternalContainer{Name: "e2e-ovn-k", Image: images.AgnHost(),
-			Network: secondaryProviderNetwork, Args: getAgnHostHTTPPortBindCMDArgs(secondaryExternalContainerPort), ExtPort: secondaryExternalContainerPort}
+			Network: secondaryProviderNetwork, CmdArgs: getAgnHostHTTPPortBindCMDArgs(secondaryExternalContainerPort), ExtPort: secondaryExternalContainerPort}
 		ginkgo.By("creating container on secondary provider network")
 		secondaryExternalContainer, err = providerCtx.CreateExternalContainer(secondaryExternalContainerSpec)
 		framework.ExpectNoError(err, "failed to create external container")
@@ -1275,7 +1275,7 @@ var _ = ginkgo.Describe("e2e ingress traffic validation", func() {
 			framework.ExpectNoError(err, "failed to get primary network")
 			externalContainerPort := infraprovider.Get().GetExternalContainerPort()
 			externalContainer = infraapi.ExternalContainer{Name: "e2e-ingress", Image: images.AgnHost(), Network: primaryProviderNetwork,
-				Args: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
+				CmdArgs: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "failed to create external service", externalContainer.String())
 		})
@@ -1672,7 +1672,7 @@ var _ = ginkgo.Describe("e2e ingress traffic validation", func() {
 			framework.ExpectNoError(err, "failed to get primary network")
 			externalContainerPort := infraprovider.Get().GetExternalContainerPort()
 			externalContainer = infraapi.ExternalContainer{Name: "e2e-ingress-add-more", Image: images.AgnHost(), Network: primaryProviderNetwork,
-				Args: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
+				CmdArgs: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "external container %s must be created successfully", externalContainer.Name)
 
@@ -1834,7 +1834,7 @@ var _ = ginkgo.Describe("e2e ingress to host-networked pods traffic validation",
 			framework.ExpectNoError(err, "failed to get primary network")
 			externalContainerPort := infraprovider.Get().GetExternalContainerPort()
 			externalContainer = infraapi.ExternalContainer{Name: clientContainerName, Image: images.AgnHost(), Network: primaryProviderNetwork,
-				Args: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
+				CmdArgs: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "external container %s must be created successfully", externalContainer.Name)
 		})
@@ -1943,7 +1943,7 @@ var _ = ginkgo.Describe("e2e br-int flow monitoring export validation", func() {
 			primaryProviderNetwork, err := infraprovider.Get().PrimaryNetwork()
 			framework.ExpectNoError(err, "failed to get primary network")
 			collectorExternalContainer := infraapi.ExternalContainer{Name: getContainerName(collectorPort), Image: "cloudflare/goflow",
-				Network: primaryProviderNetwork, Args: []string{"-kafka=false"}, ExtPort: collectorPort}
+				Network: primaryProviderNetwork, CmdArgs: []string{"-kafka=false"}, ExtPort: collectorPort}
 			collectorExternalContainer, err = providerCtx.CreateExternalContainer(collectorExternalContainer)
 			if err != nil {
 				framework.Failf("failed to start flow collector container %s: %v", getContainerName(collectorPort), err)

test/e2e/egress_firewall.go

@@ -197,7 +197,7 @@ var _ = ginkgo.Describe("e2e egress firewall policy validation", feature.EgressF
 				Name:    externalContainerName1,
 				Image:   images.AgnHost(),
 				Network: primaryProviderNetwork,
-				Args:    []string{"netexec", fmt.Sprintf("--http-port=%d", externalContainer1Port)},
+				CmdArgs: []string{"netexec", fmt.Sprintf("--http-port=%d", externalContainer1Port)},
 				ExtPort: externalContainer1Port,
 			}
 			externalContainer1, err = providerCtx.CreateExternalContainer(externalContainer1Spec)
@@ -210,7 +210,7 @@ var _ = ginkgo.Describe("e2e egress firewall policy validation", feature.EgressF
 				Name:    externalContainerName2,
 				Image:   images.AgnHost(),
 				Network: primaryProviderNetwork,
-				Args:    []string{"netexec", fmt.Sprintf("--http-port=%d", externalContainer2Port)},
+				CmdArgs: []string{"netexec", fmt.Sprintf("--http-port=%d", externalContainer2Port)},
 				ExtPort: externalContainer2Port,
 			}
 			externalContainer2, err = providerCtx.CreateExternalContainer(externalContainer2Spec)

test/e2e/egress_services.go

@@ -85,7 +85,7 @@ var _ = ginkgo.Describe("EgressService", feature.EgressService, func() {
 		framework.ExpectNoError(err, "failed to get primary provider network")
 		externalContainer = infraapi.ExternalContainer{Name: externalContainerName, Image: images.AgnHost(),
 			Network: primaryProviderNetwork, ExtPort: 8080,
-			Args: getAgnHostHTTPPortBindCMDArgs(8080)}
+			CmdArgs: getAgnHostHTTPPortBindCMDArgs(8080)}
 		externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 		framework.ExpectNoError(err, "failed to create external container")
 	})
@@ -1239,7 +1239,7 @@ metadata:
 				ginkgo.By(fmt.Sprintf("Creating container %s", net.containerName))
 				// Setting the --hostname here is important since later we poke the container's /hostname endpoint
 				extContainerSecondaryNet := infraapi.ExternalContainer{Name: net.containerName, Image: images.AgnHost(), Network: network,
-					Args: []string{"netexec", "--http-port=8080"}, ExtPort: 8080}
+					CmdArgs: []string{"netexec", "--http-port=8080"}, ExtPort: 8080}
 				extContainerSecondaryNet, err = providerCtx.CreateExternalContainer(extContainerSecondaryNet)
 				ginkgo.By(fmt.Sprintf("Adding a listener for the shared IPv4 %s on %s", sharedIPv4, net.containerName))
 				out, err := infraprovider.Get().ExecExternalContainerCommand(extContainerSecondaryNet, []string{"ip", "address", "add", sharedIPv4 + "/32", "dev", "lo"})

test/e2e/egressip.go

@@ -219,7 +219,7 @@ func isSupportedAgnhostForEIP(externalContainer infraapi.ExternalContainer) bool
 	if externalContainer.Image != images.AgnHost() {
 		return false
 	}
-	if !util.SliceHasStringItem(externalContainer.Args, "netexec") {
+	if !util.SliceHasStringItem(externalContainer.CmdArgs, "netexec") {
 		return false
 	}
 	return true
@@ -754,13 +754,13 @@ var _ = ginkgo.DescribeTableSubtree("e2e egress IP validation", feature.EgressIP
 		// attach containers to the primary network
 		primaryTargetExternalContainerPort := infraprovider.Get().GetExternalContainerPort()
 		primaryTargetExternalContainerSpec := infraapi.ExternalContainer{Name: targetNodeName, Image: images.AgnHost(),
-			Network: primaryProviderNetwork, Args: getAgnHostHTTPPortBindCMDArgs(primaryTargetExternalContainerPort), ExtPort: primaryTargetExternalContainerPort}
+			Network: primaryProviderNetwork, CmdArgs: getAgnHostHTTPPortBindCMDArgs(primaryTargetExternalContainerPort), ExtPort: primaryTargetExternalContainerPort}
 		primaryTargetExternalContainer, err = providerCtx.CreateExternalContainer(primaryTargetExternalContainerSpec)
 		framework.ExpectNoError(err, "failed to create external target container on primary network", primaryTargetExternalContainerSpec.String())
 
 		primaryDeniedExternalContainerPort := infraprovider.Get().GetExternalContainerPort()
 		primaryDeniedExternalContainerSpec := infraapi.ExternalContainer{Name: deniedTargetNodeName, Image: images.AgnHost(),
-			Network: primaryProviderNetwork, Args: getAgnHostHTTPPortBindCMDArgs(primaryDeniedExternalContainerPort), ExtPort: primaryDeniedExternalContainerPort}
+			Network: primaryProviderNetwork, CmdArgs: getAgnHostHTTPPortBindCMDArgs(primaryDeniedExternalContainerPort), ExtPort: primaryDeniedExternalContainerPort}
 		primaryDeniedExternalContainer, err = providerCtx.CreateExternalContainer(primaryDeniedExternalContainerSpec)
 		framework.ExpectNoError(err, "failed to create external denied container on primary network", primaryDeniedExternalContainer.String())
 
@@ -791,7 +791,7 @@ var _ = ginkgo.DescribeTableSubtree("e2e egress IP validation", feature.EgressIP
 			Name:    targetSecondaryNodeName,
 			Image:   images.AgnHost(),
 			Network: secondaryProviderNetwork,
-			Args:    getAgnHostHTTPPortBindCMDArgs(secondaryTargetExternalContainerPort),
+			CmdArgs: getAgnHostHTTPPortBindCMDArgs(secondaryTargetExternalContainerPort),
 			ExtPort: secondaryTargetExternalContainerPort,
 		}
 		secondaryTargetExternalContainer, err = providerCtx.CreateExternalContainer(secondaryTargetExternalContainerSpec)
@@ -2125,7 +2125,7 @@ spec:
 		providerPrimaryNetwork, err := infraprovider.Get().PrimaryNetwork()
 		framework.ExpectNoError(err, "failed to get providers primary network")
 		externalContainerPrimary := infraapi.ExternalContainer{Name: "external-container-for-egressip-mtu-test", Image: images.AgnHost(),
-			Network: providerPrimaryNetwork, Args: []string{"pause"}, ExtPort: externalContainerPrimaryPort}
+			Network: providerPrimaryNetwork, CmdArgs: []string{"pause"}, ExtPort: externalContainerPrimaryPort}
 		externalContainerPrimary, err = providerCtx.CreateExternalContainer(externalContainerPrimary)
 		framework.ExpectNoError(err, "failed to create external container: %s", externalContainerPrimary.String())
 

test/e2e/external_gateways.go

@@ -144,7 +144,7 @@ var _ = ginkgo.Describe("External Gateway", feature.ExternalGateway, func() {
 			}
 			externalContainerPort := infraprovider.Get().GetExternalContainerPort()
 			externalContainer := infraapi.ExternalContainer{Name: getContainerName(gwContainerNameTemplate, externalContainerPort),
-				Image: images.AgnHost(), Network: network, ExtPort: externalContainerPort, Args: []string{"pause"}}
+				Image: images.AgnHost(), Network: network, ExtPort: externalContainerPort, CmdArgs: []string{"pause"}}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "failed to start external gateway test container")
 			if network.Name() == "host" {
@@ -238,7 +238,7 @@ var _ = ginkgo.Describe("External Gateway", feature.ExternalGateway, func() {
 			// start the container that will act as a new external gateway that the tests will be updated to use
 			externalContainer2Port := infraprovider.Get().GetExternalContainerPort()
 			externalContainer2 := infraapi.ExternalContainer{Name: getContainerName(gwContainerNameTemplate2, externalContainerPort),
-				Image: images.AgnHost(), Network: network, ExtPort: externalContainer2Port, Args: []string{"pause"}}
+				Image: images.AgnHost(), Network: network, ExtPort: externalContainer2Port, CmdArgs: []string{"pause"}}
 			externalContainer2, err = providerCtx.CreateExternalContainer(externalContainer2)
 			framework.ExpectNoError(err, "failed to start external gateway test container %s", getContainerName(gwContainerNameTemplate2, externalContainerPort))
 			if network.Name() == "host" {
@@ -365,7 +365,7 @@ var _ = ginkgo.Describe("External Gateway", feature.ExternalGateway, func() {
 			}
 			externalContainerPort := infraprovider.Get().GetExternalContainerPort()
 			externalContainer := infraapi.ExternalContainer{Name: getContainerName(gwContainerTemplate, externalContainerPort), Image: images.AgnHost(), Network: network,
-				Args: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
+				CmdArgs: getAgnHostHTTPPortBindCMDArgs(externalContainerPort), ExtPort: externalContainerPort}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "failed to start external gateway test container %s", getContainerName(gwContainerTemplate, externalContainerPort))
 			if network.Name() == "host" {
@@ -2922,9 +2922,9 @@ func setupGatewayContainers(f *framework.Framework, providerCtx infraapi.Context
 
 	var err error
 	externalContainer1 := infraapi.ExternalContainer{Name: getContainerName(container1Template, uint16(gwTCPPort)),
-		Image: externalContainerImage, Network: network, Args: []string{}, ExtPort: uint16(gwTCPPort)}
+		Image: externalContainerImage, Network: network, CmdArgs: []string{}, ExtPort: uint16(gwTCPPort)}
 	externalContainer2 := infraapi.ExternalContainer{Name: getContainerName(container2Template, uint16(gwTCPPort)),
-		Image: externalContainerImage, Network: network, Args: []string{}, ExtPort: uint16(gwTCPPort)}
+		Image: externalContainerImage, Network: network, CmdArgs: []string{}, ExtPort: uint16(gwTCPPort)}
 
 	gwContainers := []infraapi.ExternalContainer{externalContainer1, externalContainer2}
 	addressesv4 := gatewayTestIPs{targetIPs: make([]string, 0)}
@@ -3175,12 +3175,12 @@ func setupGatewayContainersForConntrackTest(f *framework.Framework, providerCtx
 	addressesv6 := gatewayTestIPs{gatewayIPs: make([]string, 2)}
 	ginkgo.By("Creating the gateway containers for the UDP test")
 	gwExternalContainer1 := infraapi.ExternalContainer{Name: getContainerName(gwContainer1Template, 12345),
-		Image: images.IPerf3(), Network: network, Args: []string{}, ExtPort: 12345}
+		Image: images.IPerf3(), Network: network, CmdArgs: []string{}, ExtPort: 12345}
 	gwExternalContainer1, err = providerCtx.CreateExternalContainer(gwExternalContainer1)
 	framework.ExpectNoError(err, "failed to create external container (%s)", gwExternalContainer1)
 
 	gwExternalContainer2 := infraapi.ExternalContainer{Name: getContainerName(gwContainer2Template, 12345),
-		Image: images.IPerf3(), Network: network, Args: []string{}, ExtPort: 12345}
+		Image: images.IPerf3(), Network: network, CmdArgs: []string{}, ExtPort: 12345}
 	gwExternalContainer2, err = providerCtx.CreateExternalContainer(gwExternalContainer2)
 	framework.ExpectNoError(err, "failed to create external container (%s)", gwExternalContainer2)
 	if network.Name() == "host" {

test/e2e/infraprovider/api/api.go

@@ -182,14 +182,15 @@ func (n NetworkInterface) GetMAC() string {
 }
 
 type ExternalContainer struct {
-	Name       string
-	Image      string
-	Network    Network
-	Entrypoint string
-	Args       []string
-	ExtPort    uint16
-	IPv4       string
-	IPv6       string
+	Name        string
+	Image       string
+	Network     Network
+	Entrypoint  string
+	CmdArgs     []string
+	ExtPort     uint16
+	IPv4        string
+	IPv6        string
+	RuntimeArgs []string
 }
 
 func (ec ExternalContainer) GetName() string {
@@ -227,7 +228,7 @@ func (ec ExternalContainer) IsIPv6() bool {
 }
 
 func (ec ExternalContainer) String() string {
-	str := fmt.Sprintf("Name: %q, Image: %q, Network: %q, Command: %q", ec.Name, ec.Image, ec.Network, strings.Join(ec.Args, " "))
+	str := fmt.Sprintf("Name: %q, Image: %q, Network: %q, RuntimeArgs: %q, Command: %q", ec.Name, ec.Image, ec.Network, strings.Join(ec.RuntimeArgs, " "), strings.Join(ec.CmdArgs, " "))
 	if ec.IsIPv4() {
 		str = fmt.Sprintf("%s, IPv4 address: %q", str, ec.GetIPv4())
 	}

test/e2e/infraprovider/providers/kind/kind.go

@@ -150,9 +150,10 @@ func (c *contextKind) createExternalContainer(container api.ExternalContainer) (
 	if container.Entrypoint != "" {
 		cmd = append(cmd, "--entrypoint", container.Entrypoint)
 	}
+	cmd = append(cmd, container.RuntimeArgs...)
 	cmd = append(cmd, container.Image)
-	if len(container.Args) > 0 {
-		cmd = append(cmd, container.Args...)
+	if len(container.CmdArgs) > 0 {
+		cmd = append(cmd, container.CmdArgs...)
 	} else {
 		if images.AgnHost() == container.Image {
 			cmd = append(cmd, "pause")

test/e2e/kubevirt.go

@@ -1762,7 +1762,7 @@ write_files:
 					Name:    externalContainerName,
 					Image:   images.IPerf3(),
 					Network: providerNetwork,
-					Args:    []string{"sleep infinity"},
+					CmdArgs: []string{"sleep infinity"},
 					ExtPort: externalContainerPort,
 				}
 				externalContainer, err = providerCtx.CreateExternalContainer(externalContainerSpec)

test/e2e/multihoming.go

@@ -941,7 +941,7 @@ var _ = Describe("Multi Homing", feature.MultiHoming, func() {
 						Image:      images.AgnHost(),
 						Network:    underlayNetwork,
 						Entrypoint: "bash",
-						Args:       []string{"-c", fmt.Sprintf("ip a add %s/24 dev eth0 && ./agnhost netexec --http-port=%d", underlayServiceIP, servicePort)},
+						CmdArgs:    []string{"-c", fmt.Sprintf("ip a add %s/24 dev eth0 && ./agnhost netexec --http-port=%d", underlayServiceIP, servicePort)},
 						ExtPort:    servicePort,
 					}
 					_, err = providerCtx.CreateExternalContainer(serviceContainerSpec)
@@ -1310,7 +1310,7 @@ var _ = Describe("Multi Homing", feature.MultiHoming, func() {
 						Network:    underlayNetwork,
 						Entrypoint: "bash",
 						ExtPort:    servicePort,
-						Args: []string{"-c", fmt.Sprintf(`
+						CmdArgs: []string{"-c", fmt.Sprintf(`
 ip link add link %[1]s name %[2]s type vlan id %[3]d
 ip link set dev %[2]s up
 ip a add %[4]s/24 dev %[2]s

test/e2e/network_segmentation.go

@@ -1478,7 +1478,7 @@ spec:
 				Name:    externalContainerName,
 				Image:   images.AgnHost(),
 				Network: providerPrimaryNetwork,
-				Args:    httpServerContainerCmd(uint16(externalContainerPort)),
+				CmdArgs: httpServerContainerCmd(uint16(externalContainerPort)),
 				ExtPort: externalContainerPort,
 			}
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainerSpec)