diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 4bfbd42f840..f20b1f1c53c 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1690,32 +1690,29 @@ - testname: Container Runtime, TerminationMessage, from log output of succeeding container codename: '[sig-node] Container Runtime blackbox test on terminated container should report termination message as empty when pod succeeds and TerminationMessagePolicy - FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]' - description: 'Create a pod with an container. Container''s output is recorded in - log and container exits successfully without an error. When container is terminated, - terminationMessage MUST have no content as container succeed. [Excluded:WindowsDocker]: - Cannot mount files in Windows Containers created by Docker.' + FallbackToLogsOnError is set [NodeConformance] [Conformance]' + description: Create a pod with an container. Container's output is recorded in log + and container exits successfully without an error. When container is terminated, + terminationMessage MUST have no content as container succeed. release: v1.15 file: test/e2e/common/node/runtime.go - testname: Container Runtime, TerminationMessage, from file of succeeding container codename: '[sig-node] Container Runtime blackbox test on terminated container should report termination message from file when pod succeeds and TerminationMessagePolicy - FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]' - description: 'Create a pod with an container. Container''s output is recorded in - a file and the container exits successfully without an error. When container is - terminated, terminationMessage MUST match with the content from file. [Excluded:WindowsDocker]: - Cannot mount files in Windows Containers created by Docker.' + FallbackToLogsOnError is set [NodeConformance] [Conformance]' + description: Create a pod with an container. Container's output is recorded in a + file and the container exits successfully without an error. When container is + terminated, terminationMessage MUST match with the content from file. release: v1.15 file: test/e2e/common/node/runtime.go - testname: Container Runtime, TerminationMessage, from container's log output of failing container codename: '[sig-node] Container Runtime blackbox test on terminated container should report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError - is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]' - description: 'Create a pod with an container. Container''s output is recorded in - log and container exits with an error. When container is terminated, termination - message MUST match the expected output recorded from container''s log. [Excluded:WindowsDocker]: - Cannot mount files in Windows Containers created by Docker.' + is set [NodeConformance] [Conformance]' + description: Create a pod with an container. Container's output is recorded in log + and container exits with an error. When container is terminated, termination message + MUST match the expected output recorded from container's log. release: v1.15 file: test/e2e/common/node/runtime.go - testname: Container Runtime, Restart Policy, Pod Phases @@ -3049,46 +3046,38 @@ file: test/e2e/common/storage/secrets_volume.go - testname: 'SubPath: Reading content from a configmap volume.' codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with - configmap pod [Excluded:WindowsDocker] [Conformance]' + configmap pod [Conformance]' description: Containers in a pod can read content from a configmap mounted volume - which was configured with a subpath. This test is marked [Excluded:WindowsDocker] - since Docker does not support creating individual file mounts for containers on - Windows. + which was configured with a subpath. release: v1.12 file: test/e2e/storage/subpath.go - testname: 'SubPath: Reading content from a configmap volume.' codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with - configmap pod with mountPath of existing file [Excluded:WindowsDocker] [Conformance]' + configmap pod with mountPath of existing file [Conformance]' description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath and also using a mountpath that is a specific - file. This test is marked [Excluded:WindowsDocker] since Docker does not support - creating individual file mounts for containers on Windows. + file. release: v1.12 file: test/e2e/storage/subpath.go - testname: 'SubPath: Reading content from a downwardAPI volume.' codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with - downward pod [Excluded:WindowsDocker] [Conformance]' + downward pod [Conformance]' description: Containers in a pod can read content from a downwardAPI mounted volume - which was configured with a subpath. This test is marked [Excluded:WindowsDocker] - since Docker does not support creating individual file mounts for containers on - Windows. + which was configured with a subpath. release: v1.12 file: test/e2e/storage/subpath.go - testname: 'SubPath: Reading content from a projected volume.' codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with - projected pod [Excluded:WindowsDocker] [Conformance]' + projected pod [Conformance]' description: Containers in a pod can read content from a projected mounted volume - which was configured with a subpath. This test is marked [Excluded:WindowsDocker] - since Docker does not support creating individual file mounts for containers on - Windows. + which was configured with a subpath. release: v1.12 file: test/e2e/storage/subpath.go - testname: 'SubPath: Reading content from a secret volume.' codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with - secret pod [Excluded:WindowsDocker] [Conformance]' + secret pod [Conformance]' description: Containers in a pod can read content from a secret mounted volume which - was configured with a subpath. This test is marked [Excluded:WindowsDocker] since - Docker does not support creating individual file mounts for containers on Windows. + was configured with a subpath. release: v1.12 file: test/e2e/storage/subpath.go diff --git a/test/e2e/common/node/runtime.go b/test/e2e/common/node/runtime.go index 4f3a6e8e810..dbc74c2470e 100644 --- a/test/e2e/common/node/runtime.go +++ b/test/e2e/common/node/runtime.go @@ -168,10 +168,7 @@ while true; do sleep 1; done gomega.Expect(c.Delete()).To(gomega.Succeed()) } - ginkgo.It("should report termination message if TerminationMessagePath is set [Excluded:WindowsDocker] [NodeConformance]", func() { - // Cannot mount files in Windows Containers created by Docker. - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only - // container runtime on Windows. + ginkgo.It("should report termination message if TerminationMessagePath is set [NodeConformance]", func() { container := v1.Container{ Image: framework.BusyBoxImage, Command: []string{"/bin/sh", "-c"}, @@ -215,9 +212,8 @@ while true; do sleep 1; done Release: v1.15 Testname: Container Runtime, TerminationMessage, from container's log output of failing container Description: Create a pod with an container. Container's output is recorded in log and container exits with an error. When container is terminated, termination message MUST match the expected output recorded from container's log. - [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker. */ - framework.ConformanceIt("should report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() { + framework.ConformanceIt("should report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { container := v1.Container{ Image: framework.BusyBoxImage, Command: []string{"/bin/sh", "-c"}, @@ -232,9 +228,8 @@ while true; do sleep 1; done Release: v1.15 Testname: Container Runtime, TerminationMessage, from log output of succeeding container Description: Create a pod with an container. Container's output is recorded in log and container exits successfully without an error. When container is terminated, terminationMessage MUST have no content as container succeed. - [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker. */ - framework.ConformanceIt("should report termination message as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() { + framework.ConformanceIt("should report termination message as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { container := v1.Container{ Image: framework.BusyBoxImage, Command: []string{"/bin/sh", "-c"}, @@ -249,9 +244,8 @@ while true; do sleep 1; done Release: v1.15 Testname: Container Runtime, TerminationMessage, from file of succeeding container Description: Create a pod with an container. Container's output is recorded in a file and the container exits successfully without an error. When container is terminated, terminationMessage MUST match with the content from file. - [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker. */ - framework.ConformanceIt("should report termination message from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() { + framework.ConformanceIt("should report termination message from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { container := v1.Container{ Image: framework.BusyBoxImage, Command: []string{"/bin/sh", "-c"}, diff --git a/test/e2e/storage/subpath.go b/test/e2e/storage/subpath.go index 836bdf2ad23..01f92551322 100644 --- a/test/e2e/storage/subpath.go +++ b/test/e2e/storage/subpath.go @@ -54,10 +54,8 @@ var _ = utils.SIGDescribe("Subpath", func() { Release: v1.12 Testname: SubPath: Reading content from a secret volume. Description: Containers in a pod can read content from a secret mounted volume which was configured with a subpath. - This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows. */ - framework.ConformanceIt("should support subpaths with secret pod [Excluded:WindowsDocker]", func() { - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows. + framework.ConformanceIt("should support subpaths with secret pod", func() { pod := testsuites.SubpathTestPod(f, "secret-key", "secret", &v1.VolumeSource{Secret: &v1.SecretVolumeSource{SecretName: "my-secret"}}, privilegedSecurityContext) testsuites.TestBasicSubpath(f, "secret-value", pod) }) @@ -66,10 +64,8 @@ var _ = utils.SIGDescribe("Subpath", func() { Release: v1.12 Testname: SubPath: Reading content from a configmap volume. Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath. - This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows. */ - framework.ConformanceIt("should support subpaths with configmap pod [Excluded:WindowsDocker]", func() { - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only container runtime on Windows. + framework.ConformanceIt("should support subpaths with configmap pod", func() { pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext) testsuites.TestBasicSubpath(f, "configmap-value", pod) }) @@ -78,10 +74,8 @@ var _ = utils.SIGDescribe("Subpath", func() { Release: v1.12 Testname: SubPath: Reading content from a configmap volume. Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath and also using a mountpath that is a specific file. - This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows. */ - framework.ConformanceIt("should support subpaths with configmap pod with mountPath of existing file [Excluded:WindowsDocker]", func() { - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows. + framework.ConformanceIt("should support subpaths with configmap pod with mountPath of existing file", func() { pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext) file := "/etc/resolv.conf" pod.Spec.Containers[0].VolumeMounts[0].MountPath = file @@ -92,10 +86,8 @@ var _ = utils.SIGDescribe("Subpath", func() { Release: v1.12 Testname: SubPath: Reading content from a downwardAPI volume. Description: Containers in a pod can read content from a downwardAPI mounted volume which was configured with a subpath. - This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows. */ - framework.ConformanceIt("should support subpaths with downward pod [Excluded:WindowsDocker]", func() { - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows. + framework.ConformanceIt("should support subpaths with downward pod", func() { pod := testsuites.SubpathTestPod(f, "downward/podname", "downwardAPI", &v1.VolumeSource{ DownwardAPI: &v1.DownwardAPIVolumeSource{ Items: []v1.DownwardAPIVolumeFile{{Path: "downward/podname", FieldRef: &v1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.name"}}}, @@ -108,10 +100,8 @@ var _ = utils.SIGDescribe("Subpath", func() { Release: v1.12 Testname: SubPath: Reading content from a projected volume. Description: Containers in a pod can read content from a projected mounted volume which was configured with a subpath. - This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows. */ - framework.ConformanceIt("should support subpaths with projected pod [Excluded:WindowsDocker]", func() { - // TODO(claudiub): Remove [Excluded:WindowsDocker] tag once Containerd becomes the default container runtime on Windows. + framework.ConformanceIt("should support subpaths with projected pod", func() { pod := testsuites.SubpathTestPod(f, "projected/configmap-key", "projected", &v1.VolumeSource{ Projected: &v1.ProjectedVolumeSource{ Sources: []v1.VolumeProjection{ diff --git a/test/e2e/windows/host_process.go b/test/e2e/windows/host_process.go index 179c34d06a8..7916c4f5541 100644 --- a/test/e2e/windows/host_process.go +++ b/test/e2e/windows/host_process.go @@ -77,7 +77,7 @@ var ( User_NTAuthoritySystem = "NT AUTHORITY\\SYSTEM" ) -var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDocker] [MinimumKubeletVersion:1.22] HostProcess containers", func() { +var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [MinimumKubeletVersion:1.22] HostProcess containers", func() { ginkgo.BeforeEach(func() { e2eskipper.SkipUnlessNodeOSDistroIs("windows") SkipUnlessWindowsHostProcessContainersEnabled()