Use windows httpd upstream image for faster deploy

Author: jsturtevant

test/e2e/azure_lb.go

@@ -21,10 +21,11 @@ package e2e
 import (
 	"context"
 	"fmt"
+	"net"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	k8snet "k8s.io/utils/net"
-	"net"
 	deploymentBuilder "sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/deployment"
 	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/job"
 	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/node"
@@ -79,7 +80,7 @@ func AzureLBSpec(ctx context.Context, inputGetter func() AzureLBSpecInput) {
 	if input.Windows {
 		windowsVersion, err := node.GetWindowsVersion(clientset)
 		Expect(err).NotTo(HaveOccurred())
-		iisImage := windows.GetWindowsImage(windows.IIS, windowsVersion)
+		iisImage := windows.GetWindowsImage(windows.Httpd, windowsVersion)
 		webDeployment.SetImage(deploymentName, iisImage)
 		webDeployment.AddWindowsSelectors()
 	}

test/e2e/kubernetes/windows/windows.go

@@ -32,7 +32,8 @@ const (
 )
 
 const (
-	IIS = WindowsTestImages("IIS")
+	IIS   = WindowsTestImages("IIS")
+	Httpd = WindowsTestImages("httpd")
 )
 
 type WindowsImage struct {
@@ -56,9 +57,18 @@ func GetWindowsImage(testImage WindowsTestImages, version OSVersion) string {
 		},
 	}
 
+	httpd := WindowsImage{
+		BaseImage: "k8sprow.azurecr.io/kubernetes-e2e-test-images/httpd",
+		Tags: map[OSVersion]string{
+			LTSC2019: "2.4.39-alpine",
+		},
+	}
+
 	switch testImage {
 	case IIS:
 		return iisImage.GetImage(version)
+	case Httpd:
+		return httpd.GetImage(version)
 	default:
 		return iisImage.GetImage(version)
 	}