diff --git a/test/e2e/windows/device_plugin.go b/test/e2e/windows/device_plugin.go index a96abcd7eb5..d97cbac5830 100644 --- a/test/e2e/windows/device_plugin.go +++ b/test/e2e/windows/device_plugin.go @@ -30,7 +30,6 @@ import ( e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" - imageutils "k8s.io/kubernetes/test/utils/image" admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" @@ -99,8 +98,12 @@ var _ = sigDescribe(feature.GPUDevicePlugin, "Device Plugin", skipUnlessWindows( _, err := cs.AppsV1().DaemonSets(sysNs).Create(ctx, ds, metav1.CreateOptions{}) framework.ExpectNoError(err) + // Windows device plugin tests require the *full* windows image (not nanoserver or servercore) + // because those images do not contain the necessary DirectX components. + fullWindowsContainerImage := "mcr.microsoft.com/windows:ltsc2019" + ginkgo.By("creating Windows testing Pod") - windowsPod := createTestPod(f, imageutils.GetE2EImage(imageutils.WindowsServer), windowsOS) + windowsPod := createTestPod(f, fullWindowsContainerImage, windowsOS) windowsPod.Spec.Containers[0].Args = []string{"powershell.exe", "Start-Sleep", "3600"} windowsPod.Spec.Containers[0].Resources.Limits = v1.ResourceList{ "microsoft.com/directx": resource.MustParse("1"), diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 21890baadc2..5fc4ba32315 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -41,7 +41,6 @@ type RegistryList struct { GcRegistry string `yaml:"gcRegistry"` SigStorageRegistry string `yaml:"sigStorageRegistry"` PrivateRegistry string `yaml:"privateRegistry"` - MicrosoftRegistry string `yaml:"microsoftRegistry"` DockerLibraryRegistry string `yaml:"dockerLibraryRegistry"` CloudProviderGcpRegistry string `yaml:"cloudProviderGcpRegistry"` } @@ -138,7 +137,6 @@ var ( GcRegistry: "registry.k8s.io", SigStorageRegistry: "registry.k8s.io/sig-storage", PrivateRegistry: "gcr.io/k8s-authenticated-test", - MicrosoftRegistry: "mcr.microsoft.com", DockerLibraryRegistry: "docker.io/library", CloudProviderGcpRegistry: "registry.k8s.io/cloud-provider-gcp", } @@ -226,8 +224,6 @@ const ( VolumeISCSIServer // VolumeRBDServer image VolumeRBDServer - // WindowsServer image - WindowsServer ) func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config) { @@ -270,7 +266,6 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.3"} configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.6"} configs[VolumeRBDServer] = Config{list.PromoterE2eRegistry, "volume/rbd", "1.0.6"} - configs[WindowsServer] = Config{list.MicrosoftRegistry, "windows", "1809"} // This adds more config entries. Those have no pre-defined ImageID number, // but will be used via ReplaceRegistryInImageURL when deploying @@ -420,8 +415,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin registryAndUser = reg.PrivateRegistry case initRegistry.InvalidRegistry: registryAndUser = reg.InvalidRegistry - case initRegistry.MicrosoftRegistry: - registryAndUser = reg.MicrosoftRegistry case initRegistry.PromoterE2eRegistry: registryAndUser = reg.PromoterE2eRegistry case initRegistry.BuildImageRegistry: diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go index 7ac5f96c967..a60239e6b7a 100644 --- a/test/utils/image/manifest_test.go +++ b/test/utils/image/manifest_test.go @@ -50,9 +50,6 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) { }, { in: "invalid.registry.k8s.io/invalid/test:latest", out: "test.io/invalid/test:latest", - }, { - in: "mcr.microsoft.com/test:latest", - out: "test.io/microsoft/test:latest", }, { in: "registry.k8s.io/e2e-test-images/test:latest", out: "test.io/promoter/test:latest", @@ -70,7 +67,6 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) { PrivateRegistry: "test.io/k8s-authenticated-test", SigStorageRegistry: "test.io/sig-storage", InvalidRegistry: "test.io/invalid", - MicrosoftRegistry: "test.io/microsoft", PromoterE2eRegistry: "test.io/promoter", BuildImageRegistry: "test.io/build", GcAuthenticatedRegistry: "test.io/gcAuth", @@ -111,9 +107,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) { }, { in: "invalid.registry.k8s.io/invalid/test:latest", out: "test.io/invalid/test:latest", - }, { - in: "mcr.microsoft.com/test:latest", - out: "test.io/microsoft/test:latest", }, { in: "registry.k8s.io/e2e-test-images/test:latest", out: "test.io/promoter/test:latest", @@ -136,7 +129,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) { PrivateRegistry: "test.io/k8s-authenticated-test", SigStorageRegistry: "test.io/sig-storage", InvalidRegistry: "test.io/invalid", - MicrosoftRegistry: "test.io/microsoft", PromoterE2eRegistry: "test.io/promoter", BuildImageRegistry: "test.io/build", GcAuthenticatedRegistry: "test.io/gcAuth",