mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-09 20:17:41 +00:00
tests: Removes [Excluded:WindowsDocker] tag from Windows
We've removed support for Windows Docker in Kubernetes v1.24, so we no longer need this tag.
This commit is contained in:
parent
c8c81cbfbb
commit
2aa56e865c
55
test/conformance/testdata/conformance.yaml
vendored
55
test/conformance/testdata/conformance.yaml
vendored
@ -1690,32 +1690,29 @@
|
|||||||
- testname: Container Runtime, TerminationMessage, from log output of succeeding container
|
- testname: Container Runtime, TerminationMessage, from log output of succeeding container
|
||||||
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
||||||
report termination message as empty when pod succeeds and TerminationMessagePolicy
|
report termination message as empty when pod succeeds and TerminationMessagePolicy
|
||||||
FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
|
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
|
||||||
description: 'Create a pod with an container. Container''s output is recorded in
|
description: Create a pod with an container. Container's output is recorded in log
|
||||||
log and container exits successfully without an error. When container is terminated,
|
and container exits successfully without an error. When container is terminated,
|
||||||
terminationMessage MUST have no content as container succeed. [Excluded:WindowsDocker]:
|
terminationMessage MUST have no content as container succeed.
|
||||||
Cannot mount files in Windows Containers created by Docker.'
|
|
||||||
release: v1.15
|
release: v1.15
|
||||||
file: test/e2e/common/node/runtime.go
|
file: test/e2e/common/node/runtime.go
|
||||||
- testname: Container Runtime, TerminationMessage, from file of succeeding container
|
- testname: Container Runtime, TerminationMessage, from file of succeeding container
|
||||||
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
||||||
report termination message from file when pod succeeds and TerminationMessagePolicy
|
report termination message from file when pod succeeds and TerminationMessagePolicy
|
||||||
FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
|
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
|
||||||
description: 'Create a pod with an container. Container''s output is recorded in
|
description: Create a pod with an container. Container's output is recorded in a
|
||||||
a file and the container exits successfully without an error. When container is
|
file and the container exits successfully without an error. When container is
|
||||||
terminated, terminationMessage MUST match with the content from file. [Excluded:WindowsDocker]:
|
terminated, terminationMessage MUST match with the content from file.
|
||||||
Cannot mount files in Windows Containers created by Docker.'
|
|
||||||
release: v1.15
|
release: v1.15
|
||||||
file: test/e2e/common/node/runtime.go
|
file: test/e2e/common/node/runtime.go
|
||||||
- testname: Container Runtime, TerminationMessage, from container's log output of
|
- testname: Container Runtime, TerminationMessage, from container's log output of
|
||||||
failing container
|
failing container
|
||||||
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
codename: '[sig-node] Container Runtime blackbox test on terminated container should
|
||||||
report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError
|
report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError
|
||||||
is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
|
is set [NodeConformance] [Conformance]'
|
||||||
description: 'Create a pod with an container. Container''s output is recorded in
|
description: Create a pod with an container. Container's output is recorded in log
|
||||||
log and container exits with an error. When container is terminated, termination
|
and container exits with an error. When container is terminated, termination message
|
||||||
message MUST match the expected output recorded from container''s log. [Excluded:WindowsDocker]:
|
MUST match the expected output recorded from container's log.
|
||||||
Cannot mount files in Windows Containers created by Docker.'
|
|
||||||
release: v1.15
|
release: v1.15
|
||||||
file: test/e2e/common/node/runtime.go
|
file: test/e2e/common/node/runtime.go
|
||||||
- testname: Container Runtime, Restart Policy, Pod Phases
|
- testname: Container Runtime, Restart Policy, Pod Phases
|
||||||
@ -3049,46 +3046,38 @@
|
|||||||
file: test/e2e/common/storage/secrets_volume.go
|
file: test/e2e/common/storage/secrets_volume.go
|
||||||
- testname: 'SubPath: Reading content from a configmap volume.'
|
- testname: 'SubPath: Reading content from a configmap volume.'
|
||||||
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
|
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
|
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]
|
which was configured with a subpath.
|
||||||
since Docker does not support creating individual file mounts for containers on
|
|
||||||
Windows.
|
|
||||||
release: v1.12
|
release: v1.12
|
||||||
file: test/e2e/storage/subpath.go
|
file: test/e2e/storage/subpath.go
|
||||||
- testname: 'SubPath: Reading content from a configmap volume.'
|
- testname: 'SubPath: Reading content from a configmap volume.'
|
||||||
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
|
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
|
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
|
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
|
file.
|
||||||
creating individual file mounts for containers on Windows.
|
|
||||||
release: v1.12
|
release: v1.12
|
||||||
file: test/e2e/storage/subpath.go
|
file: test/e2e/storage/subpath.go
|
||||||
- testname: 'SubPath: Reading content from a downwardAPI volume.'
|
- testname: 'SubPath: Reading content from a downwardAPI volume.'
|
||||||
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
|
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
|
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]
|
which was configured with a subpath.
|
||||||
since Docker does not support creating individual file mounts for containers on
|
|
||||||
Windows.
|
|
||||||
release: v1.12
|
release: v1.12
|
||||||
file: test/e2e/storage/subpath.go
|
file: test/e2e/storage/subpath.go
|
||||||
- testname: 'SubPath: Reading content from a projected volume.'
|
- testname: 'SubPath: Reading content from a projected volume.'
|
||||||
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
|
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
|
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]
|
which was configured with a subpath.
|
||||||
since Docker does not support creating individual file mounts for containers on
|
|
||||||
Windows.
|
|
||||||
release: v1.12
|
release: v1.12
|
||||||
file: test/e2e/storage/subpath.go
|
file: test/e2e/storage/subpath.go
|
||||||
- testname: 'SubPath: Reading content from a secret volume.'
|
- testname: 'SubPath: Reading content from a secret volume.'
|
||||||
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
|
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
|
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
|
was configured with a subpath.
|
||||||
Docker does not support creating individual file mounts for containers on Windows.
|
|
||||||
release: v1.12
|
release: v1.12
|
||||||
file: test/e2e/storage/subpath.go
|
file: test/e2e/storage/subpath.go
|
||||||
|
|
||||||
|
@ -168,10 +168,7 @@ while true; do sleep 1; done
|
|||||||
gomega.Expect(c.Delete()).To(gomega.Succeed())
|
gomega.Expect(c.Delete()).To(gomega.Succeed())
|
||||||
}
|
}
|
||||||
|
|
||||||
ginkgo.It("should report termination message if TerminationMessagePath is set [Excluded:WindowsDocker] [NodeConformance]", func() {
|
ginkgo.It("should report termination message if TerminationMessagePath is set [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.
|
|
||||||
container := v1.Container{
|
container := v1.Container{
|
||||||
Image: framework.BusyBoxImage,
|
Image: framework.BusyBoxImage,
|
||||||
Command: []string{"/bin/sh", "-c"},
|
Command: []string{"/bin/sh", "-c"},
|
||||||
@ -215,9 +212,8 @@ while true; do sleep 1; done
|
|||||||
Release: v1.15
|
Release: v1.15
|
||||||
Testname: Container Runtime, TerminationMessage, from container's log output of failing container
|
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.
|
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{
|
container := v1.Container{
|
||||||
Image: framework.BusyBoxImage,
|
Image: framework.BusyBoxImage,
|
||||||
Command: []string{"/bin/sh", "-c"},
|
Command: []string{"/bin/sh", "-c"},
|
||||||
@ -232,9 +228,8 @@ while true; do sleep 1; done
|
|||||||
Release: v1.15
|
Release: v1.15
|
||||||
Testname: Container Runtime, TerminationMessage, from log output of succeeding container
|
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.
|
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{
|
container := v1.Container{
|
||||||
Image: framework.BusyBoxImage,
|
Image: framework.BusyBoxImage,
|
||||||
Command: []string{"/bin/sh", "-c"},
|
Command: []string{"/bin/sh", "-c"},
|
||||||
@ -249,9 +244,8 @@ while true; do sleep 1; done
|
|||||||
Release: v1.15
|
Release: v1.15
|
||||||
Testname: Container Runtime, TerminationMessage, from file of succeeding container
|
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.
|
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{
|
container := v1.Container{
|
||||||
Image: framework.BusyBoxImage,
|
Image: framework.BusyBoxImage,
|
||||||
Command: []string{"/bin/sh", "-c"},
|
Command: []string{"/bin/sh", "-c"},
|
||||||
|
@ -54,10 +54,8 @@ var _ = utils.SIGDescribe("Subpath", func() {
|
|||||||
Release: v1.12
|
Release: v1.12
|
||||||
Testname: SubPath: Reading content from a secret volume.
|
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.
|
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() {
|
framework.ConformanceIt("should support subpaths with secret pod", func() {
|
||||||
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
|
|
||||||
pod := testsuites.SubpathTestPod(f, "secret-key", "secret", &v1.VolumeSource{Secret: &v1.SecretVolumeSource{SecretName: "my-secret"}}, privilegedSecurityContext)
|
pod := testsuites.SubpathTestPod(f, "secret-key", "secret", &v1.VolumeSource{Secret: &v1.SecretVolumeSource{SecretName: "my-secret"}}, privilegedSecurityContext)
|
||||||
testsuites.TestBasicSubpath(f, "secret-value", pod)
|
testsuites.TestBasicSubpath(f, "secret-value", pod)
|
||||||
})
|
})
|
||||||
@ -66,10 +64,8 @@ var _ = utils.SIGDescribe("Subpath", func() {
|
|||||||
Release: v1.12
|
Release: v1.12
|
||||||
Testname: SubPath: Reading content from a configmap volume.
|
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.
|
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() {
|
framework.ConformanceIt("should support subpaths with configmap pod", func() {
|
||||||
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only container runtime on Windows.
|
|
||||||
pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext)
|
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)
|
testsuites.TestBasicSubpath(f, "configmap-value", pod)
|
||||||
})
|
})
|
||||||
@ -78,10 +74,8 @@ var _ = utils.SIGDescribe("Subpath", func() {
|
|||||||
Release: v1.12
|
Release: v1.12
|
||||||
Testname: SubPath: Reading content from a configmap volume.
|
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.
|
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() {
|
framework.ConformanceIt("should support subpaths with configmap pod with mountPath of existing file", func() {
|
||||||
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
|
|
||||||
pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext)
|
pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext)
|
||||||
file := "/etc/resolv.conf"
|
file := "/etc/resolv.conf"
|
||||||
pod.Spec.Containers[0].VolumeMounts[0].MountPath = file
|
pod.Spec.Containers[0].VolumeMounts[0].MountPath = file
|
||||||
@ -92,10 +86,8 @@ var _ = utils.SIGDescribe("Subpath", func() {
|
|||||||
Release: v1.12
|
Release: v1.12
|
||||||
Testname: SubPath: Reading content from a downwardAPI volume.
|
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.
|
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() {
|
framework.ConformanceIt("should support subpaths with downward pod", func() {
|
||||||
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
|
|
||||||
pod := testsuites.SubpathTestPod(f, "downward/podname", "downwardAPI", &v1.VolumeSource{
|
pod := testsuites.SubpathTestPod(f, "downward/podname", "downwardAPI", &v1.VolumeSource{
|
||||||
DownwardAPI: &v1.DownwardAPIVolumeSource{
|
DownwardAPI: &v1.DownwardAPIVolumeSource{
|
||||||
Items: []v1.DownwardAPIVolumeFile{{Path: "downward/podname", FieldRef: &v1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.name"}}},
|
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
|
Release: v1.12
|
||||||
Testname: SubPath: Reading content from a projected volume.
|
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.
|
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() {
|
framework.ConformanceIt("should support subpaths with projected pod", func() {
|
||||||
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag once Containerd becomes the default container runtime on Windows.
|
|
||||||
pod := testsuites.SubpathTestPod(f, "projected/configmap-key", "projected", &v1.VolumeSource{
|
pod := testsuites.SubpathTestPod(f, "projected/configmap-key", "projected", &v1.VolumeSource{
|
||||||
Projected: &v1.ProjectedVolumeSource{
|
Projected: &v1.ProjectedVolumeSource{
|
||||||
Sources: []v1.VolumeProjection{
|
Sources: []v1.VolumeProjection{
|
||||||
|
@ -77,7 +77,7 @@ var (
|
|||||||
User_NTAuthoritySystem = "NT AUTHORITY\\SYSTEM"
|
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() {
|
ginkgo.BeforeEach(func() {
|
||||||
e2eskipper.SkipUnlessNodeOSDistroIs("windows")
|
e2eskipper.SkipUnlessNodeOSDistroIs("windows")
|
||||||
SkipUnlessWindowsHostProcessContainersEnabled()
|
SkipUnlessWindowsHostProcessContainersEnabled()
|
||||||
|
Loading…
Reference in New Issue
Block a user